Revision: 2366
http://archive-access.svn.sourceforge.net/archive-access/?rev=2366&view=rev
Author: bradtofel
Date: 2008-07-01 16:36:18 -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/replay/DateRedirectReplayRenderer.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/HttpHeaderOperation.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/HttpHeaderProcessor.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TransparentReplayRenderer.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/DateRedirectReplayRenderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/DateRedirectReplayRenderer.java 2008-07-01 23:34:52 UTC (rev 2365)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/DateRedirectReplayRenderer.java 2008-07-01 23:36:18 UTC (rev 2366)
@@ -33,8 +33,8 @@
import org.archive.wayback.ReplayRenderer;
import org.archive.wayback.ResultURIConverter;
import org.archive.wayback.core.Resource;
-import org.archive.wayback.core.SearchResult;
-import org.archive.wayback.core.SearchResults;
+import org.archive.wayback.core.CaptureSearchResult;
+import org.archive.wayback.core.CaptureSearchResults;
import org.archive.wayback.core.WaybackRequest;
/**
@@ -50,13 +50,13 @@
*/
public void renderResource(HttpServletRequest httpRequest,
HttpServletResponse httpResponse, WaybackRequest wbRequest,
- SearchResult result, Resource resource,
- ResultURIConverter uriConverter, SearchResults results)
+ CaptureSearchResult result, Resource resource,
+ ResultURIConverter uriConverter, CaptureSearchResults results)
throws ServletException, IOException {
// redirect to the better version:
- String url = result.getAbsoluteUrl();
- String captureDate = result.getCaptureDate();
+ String url = result.getOriginalUrl();
+ String captureDate = result.getCaptureTimestamp();
String betterURI = uriConverter.makeReplayURI(captureDate,url);
httpResponse.sendRedirect(betterURI);
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/HttpHeaderOperation.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/HttpHeaderOperation.java 2008-07-01 23:34:52 UTC (rev 2365)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/HttpHeaderOperation.java 2008-07-01 23:36:18 UTC (rev 2366)
@@ -32,7 +32,7 @@
import org.archive.wayback.ResultURIConverter;
import org.archive.wayback.core.Resource;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.exception.BadContentException;
/**
@@ -70,7 +70,7 @@
* @return
*/
public static Map<String,String> processHeaders(Resource resource,
- SearchResult result, ResultURIConverter uriConverter,
+ CaptureSearchResult result, ResultURIConverter uriConverter,
HttpHeaderProcessor filter) {
HashMap<String,String> output = new HashMap<String,String>();
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/HttpHeaderProcessor.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/HttpHeaderProcessor.java 2008-07-01 23:34:52 UTC (rev 2365)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/HttpHeaderProcessor.java 2008-07-01 23:36:18 UTC (rev 2366)
@@ -27,7 +27,7 @@
import java.util.Map;
import org.archive.wayback.ResultURIConverter;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
/**
*
@@ -63,5 +63,5 @@
* @param result
*/
public void filter(Map<String,String> output, String key, String value,
- final ResultURIConverter uriConverter, SearchResult result);
+ final ResultURIConverter uriConverter, CaptureSearchResult result);
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TransparentReplayRenderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TransparentReplayRenderer.java 2008-07-01 23:34:52 UTC (rev 2365)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TransparentReplayRenderer.java 2008-07-01 23:36:18 UTC (rev 2366)
@@ -35,8 +35,8 @@
import org.archive.wayback.ReplayRenderer;
import org.archive.wayback.ResultURIConverter;
import org.archive.wayback.core.Resource;
-import org.archive.wayback.core.SearchResult;
-import org.archive.wayback.core.SearchResults;
+import org.archive.wayback.core.CaptureSearchResult;
+import org.archive.wayback.core.CaptureSearchResults;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.exception.BadContentException;
@@ -57,8 +57,8 @@
*/
public void renderResource(HttpServletRequest httpRequest,
HttpServletResponse httpResponse, WaybackRequest wbRequest,
- SearchResult result, Resource resource,
- ResultURIConverter uriConverter, SearchResults results)
+ CaptureSearchResult result, Resource resource,
+ ResultURIConverter uriConverter, CaptureSearchResults results)
throws ServletException, IOException, BadContentException {
HttpHeaderOperation.copyHTTPMessageHeader(resource, httpResponse);
@@ -80,7 +80,7 @@
* @see org.archive.wayback.replay.HeaderFilter#filter(java.util.Map, java.lang.String, java.lang.String, org.archive.wayback.ResultURIConverter, org.archive.wayback.core.SearchResult)
*/
public void filter(Map<String, String> output, String key, String value,
- ResultURIConverter uriConverter, SearchResult result) {
+ ResultURIConverter uriConverter, CaptureSearchResult result) {
// copy all HTTP headers, as-is.
output.put(key, value);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
