[Archive-access-cvs] SF.net SVN: archive-access:[3178] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/query/Renderer.java

[<bra...@us...>]

Revision: 3178
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3178&view=rev
Author:   bradtofel
Date:     2010-07-20 23:50:57 +0000 (Tue, 20 Jul 2010)

Log Message:
-----------
TWEAK: somewhat undoing wrapper code, at least allowing it to be optional

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java	2010-07-20 23:50:10 UTC (rev 3177)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java	2010-07-20 23:50:57 UTC (rev 3178)
@@ -61,8 +61,13 @@
 		if(wbRequest.isXMLMode()) {
 			uiResults.forward(httpRequest, httpResponse, xmlCaptureJsp);
 		} else {
-			uiResults.forwardWrapped(httpRequest, httpResponse, 
-					captureJsp, wbRequest.getAccessPoint().getWrapperJsp());
+			String wrapperJsp = wbRequest.getAccessPoint().getWrapperJsp();
+			if(wrapperJsp != null) {
+				uiResults.forwardWrapped(httpRequest, httpResponse, 
+						captureJsp, wrapperJsp);
+			} else {
+				uiResults.forward(httpRequest, httpResponse, captureJsp);
+			}
 		}
 	}
 
@@ -78,8 +83,14 @@
 		if(wbRequest.isXMLMode()) {
 			uiResults.forward(httpRequest, httpResponse, xmlUrlJsp);
 		} else {
-			uiResults.forwardWrapped(httpRequest, httpResponse, 
-					urlJsp,wbRequest.getAccessPoint().getWrapperJsp());
+			String wrapperJsp = wbRequest.getAccessPoint().getWrapperJsp();
+			if(wrapperJsp != null) {
+				
+				uiResults.forwardWrapped(httpRequest, httpResponse, 
+						urlJsp,wbRequest.getAccessPoint().getWrapperJsp());
+			} else {
+				uiResults.forward(httpRequest, httpResponse, urlJsp);
+			}
 		}
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.