Revision: 2370
http://archive-access.svn.sourceforge.net/archive-access/?rev=2370&view=rev
Author: bradtofel
Date: 2008-07-01 16:41:12 -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/domainprefix/DomainPrefixReplayDispatcher.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixReplayRenderer.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixReplayDispatcher.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixReplayDispatcher.java 2008-07-01 23:40:50 UTC (rev 2369)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixReplayDispatcher.java 2008-07-01 23:41:12 UTC (rev 2370)
@@ -27,8 +27,8 @@
import org.archive.wayback.ReplayDispatcher;
import org.archive.wayback.ReplayRenderer;
import org.archive.wayback.WaybackConstants;
+import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.core.Resource;
-import org.archive.wayback.core.SearchResult;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.replay.DateRedirectReplayRenderer;
import org.archive.wayback.replay.TransparentReplayRenderer;
@@ -56,12 +56,12 @@
* @see org.archive.wayback.ReplayDispatcher#getRenderer(org.archive.wayback.core.WaybackRequest, org.archive.wayback.core.SearchResult, org.archive.wayback.core.Resource)
*/
public ReplayRenderer getRenderer(WaybackRequest wbRequest,
- SearchResult result, Resource resource) {
+ CaptureSearchResult result, Resource resource) {
// if the result is not for the exact date requested, redirect to the
// exact date. some capture dates are not 14 digits, only compare as
// many digits as are in the result date:
String reqDateStr = wbRequest.get(WaybackConstants.REQUEST_EXACT_DATE);
- String resDateStr = result.get(WaybackConstants.RESULT_CAPTURE_DATE);
+ String resDateStr = result.getCaptureTimestamp();
if((resDateStr.length() > reqDateStr.length()) ||
!resDateStr.equals(reqDateStr.substring(0, resDateStr.length()))) {
return redirect;
@@ -70,12 +70,10 @@
// HTML and XHTML docs smaller than some size get marked up as HTML
if (resource.getRecordLength() < MAX_HTML_MARKUP_LENGTH) {
- if (-1 != result.get(WaybackConstants.RESULT_MIME_TYPE).indexOf(
- TEXT_HTML_MIME)) {
+ if (-1 != result.getMimeType().indexOf(TEXT_HTML_MIME)) {
return html;
}
- if (-1 != result.get(WaybackConstants.RESULT_MIME_TYPE).indexOf(
- TEXT_XHTML_MIME)) {
+ if (-1 != result.getMimeType().indexOf(TEXT_XHTML_MIME)) {
return html;
}
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixReplayRenderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixReplayRenderer.java 2008-07-01 23:40:50 UTC (rev 2369)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixReplayRenderer.java 2008-07-01 23:41:12 UTC (rev 2370)
@@ -36,8 +36,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.Timestamp;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.exception.BadContentException;
@@ -69,8 +69,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);
@@ -82,7 +82,7 @@
HTMLPage page = new HTMLPage(resource,result,uriConverter);
page.readFully();
- String resourceTS = result.getCaptureDate();
+ String resourceTS = result.getCaptureTimestamp();
String captureTS = Timestamp.parseBefore(resourceTS).getDateStr();
@@ -108,7 +108,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) {
String keyUp = key.toUpperCase();
// omit Content-Length header
@@ -119,12 +119,13 @@
// rewrite Location header URLs
if (keyUp.startsWith(HTTP_LOCATION_HEADER_UP)) {
- String baseUrl = result.getAbsoluteUrl();
- String cd = result.getCaptureDate();
+ String baseUrl = result.getOriginalUrl();
+ String resourceTS = result.getCaptureTimestamp();
+ String captureTS = Timestamp.parseBefore(resourceTS).getDateStr();
// by the spec, these should be absolute already, but just in case:
String u = UrlOperations.resolveUrl(baseUrl, value);
- output.put(key, uriConverter.makeReplayURI(cd,u));
+ output.put(key, uriConverter.makeReplayURI(captureTS,u));
} else {
// others go out as-is:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
