[Archive-access-cvs] SF.net SVN: archive-access: [2381] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java

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

Revision: 2381
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2381&view=rev
Author:   bradtofel
Date:     2008-07-01 16:56:08 -0700 (Tue, 01 Jul 2008)

Log Message:
-----------
REFACTOR: SearchResult => (Url|Capture)SearchResult

Modified Paths:
--------------
    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/webapp/AccessPoint.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java	2008-07-01 23:55:46 UTC (rev 2380)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java	2008-07-01 23:56:08 UTC (rev 2381)
@@ -41,11 +41,12 @@
 import org.archive.wayback.ResultURIConverter;
 import org.archive.wayback.WaybackConstants;
 import org.archive.wayback.accesscontrol.ExclusionFilterFactory;
+import org.archive.wayback.core.CaptureSearchResult;
 import org.archive.wayback.core.CaptureSearchResults;
 import org.archive.wayback.core.Resource;
-import org.archive.wayback.core.SearchResult;
 import org.archive.wayback.core.SearchResults;
 import org.archive.wayback.core.UIResults;
+import org.archive.wayback.core.UrlSearchResults;
 import org.archive.wayback.core.WaybackRequest;
 import org.archive.wayback.exception.AuthenticationControlException;
 import org.archive.wayback.exception.BaseExceptionRenderer;
@@ -230,7 +231,7 @@
 		WaybackRequest wbRequest = new WaybackRequest();
 		wbRequest.setContextPrefix(getAbsoluteLocalPrefix(httpRequest));
 		wbRequest.setContext(this);
-		UIResults uiResults = new UIResults(wbRequest);
+		UIResults uiResults = new UIResults(wbRequest,uriConverter);
 		String translated = "/" + translateRequestPathQuery(httpRequest);
 		uiResults.storeInRequest(httpRequest,translated);
 		RequestDispatcher dispatcher = null;
@@ -310,7 +311,7 @@
 			CaptureSearchResults captureResults = (CaptureSearchResults) results;
 	
 			// TODO: check which versions are actually accessible right now?
-			SearchResult closest = captureResults.getClosest(wbRequest);
+			CaptureSearchResult closest = captureResults.getClosest(wbRequest);
 			resource = collection.getResourceStore().retrieveResource(closest);
 			ReplayRenderer renderer = replay.getRenderer(wbRequest, closest, resource);
 			renderer.renderResource(httpRequest, httpResponse, wbRequest,
@@ -327,18 +328,19 @@
 	throws ServletException, IOException, WaybackException {
 
 		SearchResults results = collection.getResourceIndex().query(wbRequest);
-		if(results.getResultsType().equals(
-				WaybackConstants.RESULTS_TYPE_CAPTURE)) {
+		if(results instanceof CaptureSearchResults) {
 			CaptureSearchResults cResults = (CaptureSearchResults) results;
-			SearchResult closest = cResults.getClosest(wbRequest);
-			closest.put(WaybackConstants.RESULT_CLOSEST_INDICATOR, 
-					WaybackConstants.RESULT_CLOSEST_VALUE);
+			CaptureSearchResult closest = cResults.getClosest(wbRequest);
+			closest.setClosest(true);
+			query.renderCaptureResults(httpRequest,httpResponse,wbRequest,
+					cResults,uriConverter);
+
+		} else if(results instanceof UrlSearchResults) {
+			UrlSearchResults uResults = (UrlSearchResults) results;
 			query.renderUrlResults(httpRequest,httpResponse,wbRequest,
-					results,uriConverter);
-
+					uResults,uriConverter);
 		} else {
-			query.renderUrlPrefixResults(httpRequest,httpResponse,wbRequest,
-					results,uriConverter);
+			throw new WaybackException("Unknown index format");
 		}
 	}
 	


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