[Archive-access-cvs] SF.net SVN: archive-access: [2380] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/replay/HTMLPage.java

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

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

Log Message:
-----------
REFACTOR: SearchResult => (Url|Capture)SearchResult
Also now uses UIReplayResult object to forward context to .jsps

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/HTMLPage.java

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-01 23:54:14 UTC (rev 2379)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/HTMLPage.java	2008-07-01 23:55:46 UTC (rev 2380)
@@ -40,10 +40,10 @@
 
 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.query.UIQueryResults;
+import org.archive.wayback.replay.UIReplayResult;
 import org.mozilla.universalchardet.UniversalDetector;
 
 /**
@@ -68,7 +68,7 @@
 	private final static int C_BUFFER_SIZE = 4096;
 
 	private Resource resource = null;
-	private SearchResult result = null; 
+	private CaptureSearchResult result = null; 
 	private ResultURIConverter uriConverter = null;
 	/**
 	 * the internal StringBuilder
@@ -82,7 +82,7 @@
 	 * @param result
 	 * @param uriConverter 
 	 */
-	public HTMLPage(Resource resource, SearchResult result, 
+	public HTMLPage(Resource resource, CaptureSearchResult result, 
 			ResultURIConverter uriConverter) {
 		this.resource = resource;
 		this.result = result;
@@ -234,8 +234,8 @@
 	public void resolvePageUrls() {
 
 		// TODO: get url from Resource instead of SearchResult?
-		String pageUrl = result.getAbsoluteUrl();
-		String captureDate = result.getCaptureDate();
+		String pageUrl = result.getOriginalUrl();
+		String captureDate = result.getCaptureTimestamp();
 
 		String existingBaseHref = TagMagix.getBaseHref(sb);
 		if (existingBaseHref == null) {
@@ -268,8 +268,8 @@
 	public void resolveAllPageUrls() {
 
 		// TODO: get url from Resource instead of SearchResult?
-		String pageUrl = result.getAbsoluteUrl();
-		String captureDate = result.getCaptureDate();
+		String pageUrl = result.getOriginalUrl();
+		String captureDate = result.getCaptureTimestamp();
 
 		String existingBaseHref = TagMagix.getBaseHref(sb);
 		if (existingBaseHref != null) {
@@ -304,16 +304,16 @@
 	
 	public void resolveCSSUrls() {
 		// TODO: get url from Resource instead of SearchResult?
-		String pageUrl = result.getAbsoluteUrl();
-		String captureDate = result.getCaptureDate();
+		String pageUrl = result.getOriginalUrl();
+		String captureDate = result.getCaptureTimestamp();
 		TagMagix.markupCSSImports(sb,uriConverter, captureDate, pageUrl);
 	}
 
 	public void resolveASXRefUrls() {
 
 		// TODO: get url from Resource instead of SearchResult?
-		String pageUrl = result.getAbsoluteUrl();
-		String captureDate = result.getCaptureDate();
+		String pageUrl = result.getOriginalUrl();
+		String captureDate = result.getCaptureTimestamp();
 		ResultURIConverter ruc = new MMSToHTTPResultURIConverter(uriConverter);
 		
 		TagMagix.markupTagREURIC(sb, ruc, captureDate, pageUrl,
@@ -436,12 +436,12 @@
 	 */
 	public String includeJspString(String jspPath, 
 			HttpServletRequest httpRequest, HttpServletResponse httpResponse,
-			WaybackRequest wbRequest, SearchResults results, SearchResult result) 
+			WaybackRequest wbRequest, CaptureSearchResults results, 
+			CaptureSearchResult result, Resource resource) 
 	throws ServletException, IOException {
 		
-		UIQueryResults uiResults = new UIQueryResults(httpRequest, wbRequest,
-				results, uriConverter);
-		uiResults.setResult(result);
+		UIReplayResult uiResults = new UIReplayResult(httpRequest, wbRequest,
+				result, results, resource, uriConverter);
 
 		StringHttpServletResponseWrapper wrappedResponse = 
 			new StringHttpServletResponseWrapper(httpResponse);


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