Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access: [2446] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback
|
From: <bra...@us...> - 2008-07-15 01:27:32
|
Revision: 2446
http://archive-access.svn.sourceforge.net/archive-access/?rev=2446&view=rev
Author: bradtofel
Date: 2008-07-14 18:27:41 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
REFACTOR(major...): eliminating the various UIResults subclasses, which were confusing/poorly designed, in favor of a single, more flexible class that adapts to the various modes. removed many convenience methods, as the same capabilities should now be available on the underlying objects.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/SearchResults.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/UIResults.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/exception/BaseExceptionRenderer.java
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/replay/HTMLPage.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/SearchResults.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/SearchResults.java 2008-07-15 01:25:18 UTC (rev 2445)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/SearchResults.java 2008-07-15 01:27:41 UTC (rev 2446)
@@ -171,4 +171,25 @@
this.numRequested = numRequested;
putFilter(RESULTS_REQUESTED, String.valueOf(numRequested));
}
+
+ public int getNumPages() {
+ double resultsMatching = getMatchingCount();
+ double resultsPerPage = getNumRequested();
+ if(resultsPerPage == 0) {
+ return 1;
+ }
+ // calculate total pages:
+ int numPages = (int) Math.ceil(resultsMatching/resultsPerPage);
+ return numPages;
+ }
+ public int getCurPageNum() {
+ double resultsPerPage = getNumRequested();
+ double firstResult = getFirstReturned();
+ if(resultsPerPage == 0) {
+ return 1;
+ }
+ // calculate total pages:
+ int curPage = (int) Math.floor(firstResult/resultsPerPage) + 1;
+ return curPage;
+ }
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/UIResults.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/UIResults.java 2008-07-15 01:25:18 UTC (rev 2445)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/UIResults.java 2008-07-15 01:27:41 UTC (rev 2446)
@@ -24,36 +24,106 @@
*/
package org.archive.wayback.core;
+import java.io.IOException;
import java.util.Properties;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.archive.wayback.ResultURIConverter;
+import org.archive.wayback.exception.WaybackException;
import org.archive.wayback.util.StringFormatter;
import org.archive.wayback.webapp.AccessPoint;
/**
+ * Simple class which acts as the go-between between Java request handling code
+ * and .jsp files which actually draw various forms of results for end user
+ * consumption. Designed to be flexible enough to handle forward various types
+ * of data to the eventual .jsp files, and provides a handful of convenience
+ * method to simplify .jsp code.
+ *
+ * 5 main "forms" of this object:
+ * 1) Generic: has WaybackRequest, uriConverter
+ * 2) Exception: has WaybackRequest, uriConverter, WaybackException
+ * 3) CaptureQuery: has WaybackRequest, uriConverter, CaptureSearchResults
+ * 4) UrlQuery: has WaybackRequest, uriConverter, UrlSearchResults
+ * 5) Replay: has WaybackRequest, uriConverter, CaptureSearchResult,
+ * CaptureSearchResults, Resource
*
+ * There are constructors to create each of these forms from the appropriate
+ * component objects.
+ *
+ * There is also a common method "forward()" which will store the UIResults
+ * object into an HttpServletRequest, for later retrieval by .jsp files.
*
+ * There are static methods to extract each of these from an HttpServletRequest,
+ * which will also verify that the appropriate internal objects are present.
+ * These methods are intended to be used by the target .jsp files.
+ *
+ *
* @author brad
* @version $Date$, $Revision$
*/
public class UIResults {
private final static String FERRET_NAME = "ui-results";
+ // usually present
private WaybackRequest wbRequest;
+ // usually present
private ResultURIConverter uriConverter;
+ // target .jsp (or static file) we forwarded to
private String contentJsp = null;
+ // original URL that was received, prior to the forwarding
private String originalRequestURL = null;
+
+ // present for CaptureQuery and Replay requests
+ private CaptureSearchResults captureResults = null;
+ // present for UrlQuery requests
+ private UrlSearchResults urlResults = null;
+ // Present for Replay requests, the "closest" result
+ private CaptureSearchResult result = null;
+ // Present for Replay requests, the actual Resource being replayed
+ private Resource resource = null;
+ // Present for... requests that resulted in an expected Exception.
+ private WaybackException exception = null;
-
- /**
- * @param wbRequest Wayback Request argument
- */
public UIResults(WaybackRequest wbRequest,ResultURIConverter uriConverter) {
- super();
this.wbRequest = wbRequest;
this.uriConverter = uriConverter;
}
+ public UIResults(WaybackRequest wbRequest, ResultURIConverter uriConverter,
+ WaybackException exception) {
+ this.wbRequest = wbRequest;
+ this.uriConverter = uriConverter;
+ this.exception = exception;
+ }
+ public UIResults(WaybackRequest wbRequest, ResultURIConverter uriConverter,
+ CaptureSearchResults captureResults) {
+ this.wbRequest = wbRequest;
+ this.uriConverter = uriConverter;
+ this.captureResults = captureResults;
+ }
+ public UIResults(WaybackRequest wbRequest, ResultURIConverter uriConverter,
+ UrlSearchResults urlResults) {
+ this.wbRequest = wbRequest;
+ this.uriConverter = uriConverter;
+ this.urlResults = urlResults;
+ }
+ public UIResults(WaybackRequest wbRequest, ResultURIConverter uriConverter,
+ CaptureSearchResults captureResults, CaptureSearchResult result,
+ Resource resource) {
+ this.wbRequest = wbRequest;
+ this.uriConverter = uriConverter;
+ this.captureResults = captureResults;
+ this.result = result;
+ this.resource = resource;
+ }
+
+ /*
+ * GENERAL GETTERS:
+ */
+
/**
* @return Returns the wbRequest.
*/
@@ -63,8 +133,58 @@
}
return wbRequest;
}
-
/**
+ * @return the ResultURIConverter
+ */
+ public ResultURIConverter getURIConverter() {
+ return uriConverter;
+ }
+ /**
+ * @return the captureResults
+ */
+ public CaptureSearchResults getCaptureResults() {
+ return captureResults;
+ }
+ /**
+ * @return the urlResults
+ */
+ public UrlSearchResults getUrlResults() {
+ return urlResults;
+ }
+ /**
+ * @return the result
+ */
+ public CaptureSearchResult getResult() {
+ return result;
+ }
+ /**
+ * @return the resource
+ */
+ public Resource getResource() {
+ return resource;
+ }
+ /**
+ * @return the exception
+ */
+ public WaybackException getException() {
+ return exception;
+ }
+ /**
+ * @return the contentJsp
+ */
+ public String getContentJsp() {
+ return contentJsp;
+ }
+
+ public String getOriginalRequestURL() {
+ return originalRequestURL;
+ }
+
+ /*
+ * JSP CONVENIENCE METHODS:
+ */
+
+ /**
* @param url
* @return String url that will make a query for all captures of an URL.
*/
@@ -76,13 +196,49 @@
return newWBR.getContextPrefix() + "query?" +
newWBR.getQueryArguments(1);
}
+ /**
+ * @param configName
+ * @return String configuration for the context, if present, otherwise null
+ */
+ public String getContextConfig(final String configName) {
+ String configValue = null;
+ AccessPoint context = getWbRequest().getAccessPoint();
+ if(context != null) {
+ Properties configs = context.getConfigs();
+ if(configs != null) {
+ configValue = configs.getProperty(configName);
+ }
+ }
+ return configValue;
+ }
+ /**
+ * @param result
+ * @return URL string that will replay the specified Resource Result.
+ */
+ public String resultToReplayUrl(CaptureSearchResult result) {
+ if(uriConverter == null) {
+ return null;
+ }
+ String url = result.getOriginalUrl();
+ String captureDate = result.getCaptureTimestamp();
+ return uriConverter.makeReplayURI(captureDate,url);
+ }
/**
- * @return StringFormatter localized to user request
+ * @param pageNum
+ * @return String URL which will drive browser to search results for a
+ * different page of results for the same query
*/
- public StringFormatter getFormatter() {
- return getWbRequest().getFormatter();
+ public String urlForPage(int pageNum) {
+ WaybackRequest wbRequest = getWbRequest();
+ return wbRequest.getContextPrefix() + "query?" +
+ wbRequest.getQueryArguments(pageNum);
}
+
+ /*
+ * FORWARD TO A .JSP
+ */
+
/**
* Store this UIResults in the HttpServletRequest argument.
* @param httpRequest
@@ -96,28 +252,149 @@
}
/**
+ * @param request
+ * @param response
+ * @param targt
+ * @throws ServletException
+ * @throws IOException
+ */
+ public void forward(HttpServletRequest request,
+ HttpServletResponse response, final String target)
+ throws ServletException, IOException {
+
+ this.contentJsp = target;
+ this.originalRequestURL = request.getRequestURL().toString();
+ request.setAttribute(FERRET_NAME, this);
+ RequestDispatcher dispatcher = request.getRequestDispatcher(target);
+ if(dispatcher == null) {
+ throw new IOException("No dispatcher for " + target);
+ }
+ dispatcher.forward(request, response);
+ }
+
+ /*
+ * EXTRACT FROM HttpServletRequest
+ */
+ /**
* @param httpRequest
- * @return UIResults from httpRequest, or a generic one if not present
+ * @return generic UIResult with info from httpRequest applied.
*/
- public static UIResults getFromRequest(HttpServletRequest httpRequest) {
+ public static UIResults getGeneric(HttpServletRequest httpRequest) {
UIResults results = (UIResults) httpRequest.getAttribute(FERRET_NAME);
if(results == null) {
- results = getGeneric(httpRequest);
- // why not store it in case someone else needs it...
-// results.storeInRequest(httpRequest,"");
+ WaybackRequest wbRequest = new WaybackRequest();
+ wbRequest.fixup(httpRequest);
+ results = new UIResults(wbRequest, null);
}
return results;
}
-
+
/**
* @param httpRequest
- * @return generic UIResult with info from httpRequest applied.
+ * @return UIResults from httpRequest
+ * @throws ServletException
*/
- public static UIResults getGeneric(HttpServletRequest httpRequest) {
- WaybackRequest wbRequest = new WaybackRequest();
- wbRequest.fixup(httpRequest);
- return new UIResults(wbRequest, null);
+ public static UIResults extractException(HttpServletRequest httpRequest)
+ throws ServletException {
+
+ UIResults results = (UIResults) httpRequest.getAttribute(FERRET_NAME);
+ if(results == null) {
+ throw new ServletException("No attribute..");
+ }
+ if(results.exception == null) {
+ throw new ServletException("No WaybackException..");
+ }
+ if(results.wbRequest == null) {
+ throw new ServletException("No WaybackRequest..");
+ }
+ if(results.uriConverter == null) {
+ throw new ServletException("No ResultURIConverter..");
+ }
+ return results;
}
+ /**
+ * @param httpRequest
+ * @return UIResults from httpRequest
+ * @throws ServletException
+ */
+ public static UIResults extractCaptureQuery(HttpServletRequest httpRequest)
+ throws ServletException {
+
+ UIResults results = (UIResults) httpRequest.getAttribute(FERRET_NAME);
+ if(results == null) {
+ throw new ServletException("No attribute..");
+ }
+ if(results.wbRequest == null) {
+ throw new ServletException("No WaybackRequest..");
+ }
+ if(results.uriConverter == null) {
+ throw new ServletException("No ResultURIConverter..");
+ }
+ if(results.captureResults == null) {
+ throw new ServletException("No CaptureSearchResults..");
+ }
+ return results;
+ }
+ /**
+ * @param httpRequest
+ * @return UIResults from httpRequest
+ * @throws ServletException
+ */
+ public static UIResults extractUrlQuery(HttpServletRequest httpRequest)
+ throws ServletException {
+
+ UIResults results = (UIResults) httpRequest.getAttribute(FERRET_NAME);
+ if(results == null) {
+ throw new ServletException("No attribute..");
+ }
+ if(results.wbRequest == null) {
+ throw new ServletException("No WaybackRequest..");
+ }
+ if(results.uriConverter == null) {
+ throw new ServletException("No ResultURIConverter..");
+ }
+ if(results.urlResults == null) {
+ throw new ServletException("No UrlSearchResults..");
+ }
+ return results;
+ }
+ /**
+ * @param httpRequest
+ * @return UIResults from httpRequest
+ * @throws ServletException
+ */
+ public static UIResults extractReplay(HttpServletRequest httpRequest)
+ throws ServletException {
+
+ UIResults results = (UIResults) httpRequest.getAttribute(FERRET_NAME);
+ if(results == null) {
+ throw new ServletException("No attribute..");
+ }
+ if(results.wbRequest == null) {
+ throw new ServletException("No WaybackRequest..");
+ }
+ if(results.uriConverter == null) {
+ throw new ServletException("No ResultURIConverter..");
+ }
+ if(results.captureResults == null) {
+ throw new ServletException("No CaptureSearchResults..");
+ }
+ if(results.result == null) {
+ throw new ServletException("No CaptureSearchResult..");
+ }
+ if(results.resource == null) {
+ throw new ServletException("No Resource..");
+ }
+ return results;
+ }
+
+
+
+ /*
+ * STATIC CONVENIENCE METHODS
+ */
+
+
private static void replaceAll(StringBuffer s,
final String o, final String n) {
int olen = o.length();
@@ -175,79 +452,53 @@
replaceAll(encoded,"gt",">");
replaceAll(encoded,"quot",""");
return encoded.toString();
- }
+ }
+ /*
+ * DEPRECATED
+ */
+
/**
* @return URL that points to the root of the current WaybackContext
+ * @deprecated
*/
public String getContextPrefix() {
return getWbRequest().getContextPrefix();
}
+
+ /**
+ * @return StringFormatter localized to user request
+ * @deprecated
+ */
+ public StringFormatter getFormatter() {
+ return getWbRequest().getFormatter();
+ }
/**
* @return URL that points to the root of the Server
+ * @deprecated
*/
public String getServerPrefix() {
return getWbRequest().getServerPrefix();
}
+
/**
- * @return the contentJsp
- */
- public String getContentJsp() {
- return contentJsp;
- }
- /**
* @param contentJsp the contentJsp to set
+ * @deprecated
*/
public void setContentJsp(String contentJsp) {
this.contentJsp = contentJsp;
}
- /**
- * @param configName
- * @return String configuration for the context, if present, otherwise null
- */
- public String getContextConfig(final String configName) {
- String configValue = null;
- AccessPoint context = getWbRequest().getAccessPoint();
- if(context != null) {
- Properties configs = context.getConfigs();
- if(configs != null) {
- configValue = configs.getProperty(configName);
- }
- }
- return configValue;
- }
- public String getOriginalRequestURL() {
- return originalRequestURL;
- }
- /**
- * @param result
- * @return URL string that will replay the specified Resource Result.
- */
- public String resultToReplayUrl(CaptureSearchResult result) {
- if(uriConverter == null) {
- return null;
- }
- String url = result.getOriginalUrl();
- String captureDate = result.getCaptureTimestamp();
- return uriConverter.makeReplayURI(captureDate,url);
- }
/**
- * @return the ResultURIConverter
- */
- public ResultURIConverter getURIConverter() {
- return uriConverter;
- }
-
- /**
* @param url
* @param timestamp
* @return String url that will replay the url at timestamp
+ * @deprecated
*/
public String makeReplayUrl(String url, String timestamp) {
if(uriConverter == null) {
return null;
}
return uriConverter.makeReplayURI(timestamp, url);
- }
+ }
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/exception/BaseExceptionRenderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/exception/BaseExceptionRenderer.java 2008-07-15 01:25:18 UTC (rev 2445)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/exception/BaseExceptionRenderer.java 2008-07-15 01:27:41 UTC (rev 2446)
@@ -28,7 +28,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -141,15 +140,8 @@
wbRequest, exception);
httpRequest.setAttribute("exception", exception);
- UIResults uiResults = new UIResults(wbRequest,null);
- uiResults.storeInRequest(httpRequest, jspPath);
-
- RequestDispatcher dispatcher = httpRequest
- .getRequestDispatcher(jspPath);
- if(dispatcher == null) {
- throw new ServletException("Null dispatcher for " + jspPath);
- }
- dispatcher.forward(httpRequest, httpResponse);
+ UIResults uiResults = new UIResults(wbRequest,null,exception);
+ uiResults.forward(httpRequest, httpResponse, jspPath);
}
public String getErrorJsp() {
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 2008-07-15 01:25:18 UTC (rev 2445)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java 2008-07-15 01:27:41 UTC (rev 2446)
@@ -26,7 +26,6 @@
import java.io.IOException;
-import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -34,6 +33,7 @@
import org.archive.wayback.QueryRenderer;
import org.archive.wayback.ResultURIConverter;
import org.archive.wayback.core.CaptureSearchResults;
+import org.archive.wayback.core.UIResults;
import org.archive.wayback.core.UrlSearchResults;
import org.archive.wayback.core.WaybackRequest;
@@ -52,36 +52,17 @@
private String xmlCaptureJsp = "/query/XMLCaptureResults.jsp";
private String xmlUrlJsp = "/query/XMLUrlResults.jsp";
- /**
- * @param request
- * @param response
- * @param jspName
- * @throws ServletException
- * @throws IOException
- */
- private void proxyRequest(HttpServletRequest request,
- HttpServletResponse response, final String jspPath)
- throws ServletException, IOException {
-
- RequestDispatcher dispatcher = request.getRequestDispatcher(jspPath);
- dispatcher.forward(request, response);
- }
-
public void renderCaptureResults(HttpServletRequest httpRequest,
HttpServletResponse httpResponse, WaybackRequest wbRequest,
CaptureSearchResults results, ResultURIConverter uriConverter)
throws ServletException, IOException {
- UICaptureQueryResults uiResults = new UICaptureQueryResults(httpRequest,
- wbRequest, results, uriConverter);
String jsp = captureJsp;
if(wbRequest.isXMLMode()) {
jsp = xmlCaptureJsp;
}
-
- uiResults.storeInRequest(httpRequest,jsp);
- proxyRequest(httpRequest, httpResponse, jsp);
-
+ UIResults uiResults = new UIResults(wbRequest,uriConverter,results);
+ uiResults.forward(httpRequest, httpResponse, jsp);
}
/* (non-Javadoc)
@@ -92,16 +73,12 @@
UrlSearchResults results, ResultURIConverter uriConverter)
throws ServletException, IOException {
- UIUrlQueryResults uiResults = new UIUrlQueryResults(httpRequest, wbRequest,
- results, uriConverter);
String jsp = urlJsp;
if(wbRequest.isXMLMode()) {
jsp = xmlUrlJsp;
}
-
- uiResults.storeInRequest(httpRequest,jsp);
- proxyRequest(httpRequest, httpResponse, jsp);
-
+ UIResults uiResults = new UIResults(wbRequest,uriConverter,results);
+ uiResults.forward(httpRequest, httpResponse, jsp);
}
/**
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/HTMLPage.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/HTMLPage.java 2008-07-15 01:25:18 UTC (rev 2445)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/HTMLPage.java 2008-07-15 01:27:41 UTC (rev 2446)
@@ -33,7 +33,6 @@
import java.text.ParseException;
import java.util.Map;
-import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -42,8 +41,8 @@
import org.archive.wayback.core.Resource;
import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.core.CaptureSearchResults;
+import org.archive.wayback.core.UIResults;
import org.archive.wayback.core.WaybackRequest;
-import org.archive.wayback.replay.UIReplayResult;
import org.mozilla.universalchardet.UniversalDetector;
/**
@@ -440,14 +439,15 @@
CaptureSearchResult result, Resource resource)
throws ServletException, IOException {
- UIReplayResult uiResults = new UIReplayResult(httpRequest, wbRequest,
- result, results, resource, uriConverter);
+ UIResults uiResults = new UIResults(wbRequest,uriConverter,results,
+ result,resource);
StringHttpServletResponseWrapper wrappedResponse =
new StringHttpServletResponseWrapper(httpResponse);
- uiResults.storeInRequest(httpRequest,jspPath);
- RequestDispatcher dispatcher = httpRequest.getRequestDispatcher(jspPath);
- dispatcher.forward(httpRequest, wrappedResponse);
+ uiResults.forward(httpRequest, wrappedResponse, jspPath);
+// uiResults.storeInRequest(httpRequest,jspPath);
+// RequestDispatcher dispatcher = httpRequest.getRequestDispatcher(jspPath);
+// dispatcher.forward(httpRequest, wrappedResponse);
return wrappedResponse.getStringResponse();
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java 2008-07-15 01:25:18 UTC (rev 2445)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java 2008-07-15 01:27:41 UTC (rev 2446)
@@ -28,7 +28,6 @@
import java.util.Properties;
import java.util.logging.Logger;
-import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -232,24 +231,32 @@
HttpServletResponse httpResponse)
throws ServletException, IOException {
+ String translated = "/" + translateRequestPathQuery(httpRequest);
+
WaybackRequest wbRequest = new WaybackRequest();
wbRequest.setContextPrefix(getAbsoluteLocalPrefix(httpRequest));
wbRequest.setAccessPoint(this);
+
UIResults uiResults = new UIResults(wbRequest,uriConverter);
- String translated = "/" + translateRequestPathQuery(httpRequest);
- uiResults.storeInRequest(httpRequest,translated);
- RequestDispatcher dispatcher = null;
+ try {
+ uiResults.forward(httpRequest, httpResponse, translated);
+ return true;
+ } catch(IOException e) {
+ // TODO: figure out if we got IO because of a missing dispatcher
+ }
+// uiResults.storeInRequest(httpRequest,translated);
+// RequestDispatcher dispatcher = null;
// // special case for the front '/' page:
// if(translated.length() == 0) {
// translated = "/";
// } else {
// translated = "/" + translated;
// }
- dispatcher = httpRequest.getRequestDispatcher(translated);
- if(dispatcher != null) {
- dispatcher.forward(httpRequest, httpResponse);
- return true;
- }
+// dispatcher = httpRequest.getRequestDispatcher(translated);
+// if(dispatcher != null) {
+// dispatcher.forward(httpRequest, httpResponse);
+// return true;
+// }
return false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
