Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access: [2369] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/archivalurl
|
From: <bra...@us...> - 2008-07-01 23:40:40
|
Revision: 2369
http://archive-access.svn.sourceforge.net/archive-access/?rev=2369&view=rev
Author: bradtofel
Date: 2008-07-01 16:40:50 -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/archivalurl/ArchivalUrlASXReplayRenderer.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlCSSReplayRenderer.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlReplayDispatcher.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlReplayRenderer.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlTransparentReplayRenderer.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlASXReplayRenderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlASXReplayRenderer.java 2008-07-01 23:40:18 UTC (rev 2368)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlASXReplayRenderer.java 2008-07-01 23:40:50 UTC (rev 2369)
@@ -9,8 +9,8 @@
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;
import org.archive.wayback.replay.HTMLPage;
@@ -22,8 +22,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 {
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlCSSReplayRenderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlCSSReplayRenderer.java 2008-07-01 23:40:18 UTC (rev 2368)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlCSSReplayRenderer.java 2008-07-01 23:40:50 UTC (rev 2369)
@@ -9,8 +9,8 @@
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;
import org.archive.wayback.replay.HTMLPage;
@@ -22,8 +22,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);
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlReplayDispatcher.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlReplayDispatcher.java 2008-07-01 23:40:18 UTC (rev 2368)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlReplayDispatcher.java 2008-07-01 23:40:50 UTC (rev 2369)
@@ -30,7 +30,7 @@
import org.archive.wayback.ReplayRenderer;
import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.Resource;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.replay.DateRedirectReplayRenderer;
@@ -71,13 +71,13 @@
* @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 reqDateStr = wbRequest.get(WaybackConstants.REQUEST_DATE);
+ String resDateStr = result.getCaptureTimestamp();
if(!resDateStr.equals(reqDateStr.substring(0, resDateStr.length()))) {
return redirect;
}
@@ -85,7 +85,7 @@
// only bother attempting markup on pages smaller than some size:
if (resource.getRecordLength() < MAX_HTML_MARKUP_LENGTH) {
- String resultMime = result.get(WaybackConstants.RESULT_MIME_TYPE);
+ String resultMime = result.getMimeType();
// HTML and XHTML docs get marked up as HTML
if (-1 != resultMime.indexOf(TEXT_HTML_MIME)) {
return archivalHTML;
@@ -100,7 +100,7 @@
if (-1 != resultMime.indexOf(ASX_MIME)) {
return archivalASX;
}
- String resultPath = result.get(WaybackConstants.RESULT_URL_KEY);
+ String resultPath = result.getUrlKey();
resultPath = resultPath.substring(resultPath.indexOf('/'));
int queryIdx = resultPath.indexOf('?');
if(queryIdx > 0) {
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlReplayRenderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlReplayRenderer.java 2008-07-01 23:40:18 UTC (rev 2368)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlReplayRenderer.java 2008-07-01 23:40:50 UTC (rev 2369)
@@ -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.WaybackRequest;
import org.archive.wayback.exception.BadContentException;
import org.archive.wayback.replay.HTMLPage;
@@ -67,8 +67,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 {
StringBuilder toInsert = new StringBuilder(300);
@@ -98,7 +98,7 @@
Iterator<String> itr = jspInserts.iterator();
while(itr.hasNext()) {
toInsert.append(page.includeJspString(itr.next(), httpRequest,
- httpResponse, wbRequest, results, result));
+ httpResponse, wbRequest, results, result, resource));
}
}
@@ -129,7 +129,7 @@
* @see org.archive.wayback.replay.HttpHeaderProcessor#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();
@@ -142,8 +142,8 @@
if (keyUp.startsWith(HTTP_LOCATION_HEADER_UP) ||
keyUp.startsWith(HTTP_CONTENT_BASE_HEADER_UP)) {
- String baseUrl = result.getAbsoluteUrl();
- String cd = result.getCaptureDate();
+ String baseUrl = result.getOriginalUrl();
+ String cd = result.getCaptureTimestamp();
// by the spec, these should be absolute already, but just in case:
String u = UrlOperations.resolveUrl(baseUrl, value);
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlTransparentReplayRenderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlTransparentReplayRenderer.java 2008-07-01 23:40:18 UTC (rev 2368)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlTransparentReplayRenderer.java 2008-07-01 23:40:50 UTC (rev 2369)
@@ -3,7 +3,7 @@
import java.util.Map;
import org.archive.wayback.ResultURIConverter;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.replay.TransparentReplayRenderer;
import org.archive.wayback.util.url.UrlOperations;
@@ -21,7 +21,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();
@@ -29,8 +29,8 @@
if (keyUp.startsWith(HTTP_LOCATION_HEADER_UP) ||
keyUp.startsWith(HTTP_CONTENT_BASE_HEADER_UP)) {
- String baseUrl = result.getAbsoluteUrl();
- String cd = result.getCaptureDate();
+ String baseUrl = result.getOriginalUrl();
+ String cd = result.getCaptureTimestamp();
// by the spec, these should be absolute already, but just in case:
String u = UrlOperations.resolveUrl(baseUrl, value);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
