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

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

Revision: 1907
          http://archive-access.svn.sourceforge.net/archive-access/?rev=1907&view=rev
Author:   bradtofel
Date:     2007-08-17 17:56:22 -0700 (Fri, 17 Aug 2007)

Log Message:
-----------
FEATURE: now uses XML jsp's if the WaybackRequest indicates XML data is desired.

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	2007-08-18 00:54:08 UTC (rev 1906)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java	2007-08-18 00:56:22 UTC (rev 1907)
@@ -25,7 +25,6 @@
 package org.archive.wayback.query;
 
 import java.io.IOException;
-import java.text.ParseException;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
@@ -34,6 +33,7 @@
 
 import org.archive.wayback.QueryRenderer;
 import org.archive.wayback.ResultURIConverter;
+import org.archive.wayback.WaybackConstants;
 import org.archive.wayback.core.SearchResults;
 import org.archive.wayback.core.UIResults;
 import org.archive.wayback.core.WaybackRequest;
@@ -48,8 +48,10 @@
 public class Renderer implements QueryRenderer {
 
 	private String errorJsp = "/jsp/HTMLError.jsp";
+	private String xmlErrorJsp = "/jsp/XMLError.jsp";
 	private String captureJsp = "/jsp/HTMLResults.jsp";
 	private String urlJsp = "/jsp/HTMLResults.jsp";
+	private String xmlJsp = "/jsp/XMLResults.jsp";
 	
 	/**
 	 * @param request
@@ -72,9 +74,13 @@
 
 		httpRequest.setAttribute("exception", exception);
 		UIResults uiResults = new UIResults(wbRequest);
-		uiResults.storeInRequest(httpRequest,errorJsp);
+		String jsp = errorJsp;
+		if(wbRequest.containsKey(WaybackConstants.REQUEST_XML_DATA)) {
+			jsp = xmlErrorJsp;
+		}
+		uiResults.storeInRequest(httpRequest,jsp);
 
-		proxyRequest(httpRequest,httpResponse,errorJsp);
+		proxyRequest(httpRequest,httpResponse,jsp);
 	}
 
 	public void renderUrlResults(HttpServletRequest httpRequest,
@@ -82,18 +88,15 @@
 			SearchResults results, ResultURIConverter uriConverter)
 			throws ServletException, IOException {
 
-		UIQueryResults uiResults;
-		try {
-			uiResults = new UIQueryResults(httpRequest, wbRequest, results,
-					uriConverter);
-		} catch (ParseException e) {
-			// I don't think this should happen...
-			e.printStackTrace();
-			throw new ServletException(e.getMessage());
+		UIQueryResults uiResults = new UIQueryResults(httpRequest, wbRequest,
+				results, uriConverter);
+		String jsp = captureJsp;
+		if(wbRequest.containsKey(WaybackConstants.REQUEST_XML_DATA)) {
+			jsp = xmlJsp;
 		}
 
-		uiResults.storeInRequest(httpRequest,captureJsp);
-		proxyRequest(httpRequest, httpResponse, captureJsp);
+		uiResults.storeInRequest(httpRequest,jsp);
+		proxyRequest(httpRequest, httpResponse, jsp);
 
 	}
 
@@ -105,18 +108,15 @@
 			SearchResults results, ResultURIConverter uriConverter)
 			throws ServletException, IOException {
 
-		UIQueryResults uiResults;
-		try {
-			uiResults = new UIQueryResults(httpRequest, wbRequest, results,
-					uriConverter);
-		} catch (ParseException e) {
-			// I don't think this should happen...
-			e.printStackTrace();
-			throw new ServletException(e.getMessage());
+		UIQueryResults uiResults = new UIQueryResults(httpRequest, wbRequest, 
+				results, uriConverter);
+		String jsp = urlJsp;
+		if(wbRequest.containsKey(WaybackConstants.REQUEST_XML_DATA)) {
+			jsp = xmlJsp;
 		}
 
-		uiResults.storeInRequest(httpRequest,urlJsp);
-		proxyRequest(httpRequest, httpResponse, urlJsp);
+		uiResults.storeInRequest(httpRequest,jsp);
+		proxyRequest(httpRequest, httpResponse, jsp);
 
 	}
 


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