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

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

Revision: 3126
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3126&view=rev
Author:   bradtofel
Date:     2010-05-28 03:23:46 +0000 (Fri, 28 May 2010)

Log Message:
-----------
BUGFIX introduce by last checkin. was not using AccessPoint wrapper

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-05-28 03:23:17 UTC (rev 3125)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java	2010-05-28 03:23:46 UTC (rev 3126)
@@ -57,12 +57,13 @@
 			CaptureSearchResults results, ResultURIConverter uriConverter)
 			throws ServletException, IOException {
 
-		String jsp = captureJsp;
+		UIResults uiResults = new UIResults(wbRequest,uriConverter,results);
 		if(wbRequest.isXMLMode()) {
-			jsp = xmlCaptureJsp;
+			uiResults.forward(httpRequest, httpResponse, xmlCaptureJsp);
+		} else {
+			uiResults.forwardWrapped(httpRequest, httpResponse, 
+					captureJsp, wbRequest.getAccessPoint().getWrapperJsp());
 		}
-		UIResults uiResults = new UIResults(wbRequest,uriConverter,results);
-		uiResults.forward(httpRequest, httpResponse, jsp);
 	}
 
 	/* (non-Javadoc)
@@ -73,12 +74,13 @@
 			UrlSearchResults results, ResultURIConverter uriConverter)
 			throws ServletException, IOException {
 
-		String jsp = urlJsp;
+		UIResults uiResults = new UIResults(wbRequest,uriConverter,results);
 		if(wbRequest.isXMLMode()) {
-			jsp = xmlUrlJsp;
+			uiResults.forward(httpRequest, httpResponse, xmlUrlJsp);
+		} else {
+			uiResults.forwardWrapped(httpRequest, httpResponse, 
+					urlJsp,wbRequest.getAccessPoint().getWrapperJsp());
 		}
-		UIResults uiResults = new UIResults(wbRequest,uriConverter,results);
-		uiResults.forward(httpRequest, httpResponse, jsp);
 	}
 
 	/**


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