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

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

Revision: 2119
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2119&view=rev
Author:   bradtofel
Date:     2007-12-21 18:19:35 -0800 (Fri, 21 Dec 2007)

Log Message:
-----------
FEATURE: added get/setResult() to UIQueryResults. This is set by HTMLPage when including JSP files in replayed documents via ArchivalURL mode

Modified Paths:
--------------
    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/query/UIQueryResults.java
    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/archivalurl/ArchivalUrlReplayRenderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlReplayRenderer.java	2007-12-22 00:59:25 UTC (rev 2118)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlReplayRenderer.java	2007-12-22 02:19:35 UTC (rev 2119)
@@ -98,7 +98,7 @@
 			Iterator<String> itr = jspInserts.iterator();
 			while(itr.hasNext()) {
 				toInsert.append(page.includeJspString(itr.next(), httpRequest, 
-						httpResponse, wbRequest, results));
+						httpResponse, wbRequest, results, result));
 			}
 		}
 

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/UIQueryResults.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/UIQueryResults.java	2007-12-22 00:59:25 UTC (rev 2118)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/UIQueryResults.java	2007-12-22 02:19:35 UTC (rev 2119)
@@ -74,6 +74,7 @@
 	private int curPage;
 
 	private SearchResults results;
+	private SearchResult result;
 	private ResultURIConverter uriConverter;
 
 	/**
@@ -312,4 +313,12 @@
 	public Timestamp getExactRequestedTimestamp() {
 		return exactRequestedTimestamp;
 	}
+
+	public SearchResult getResult() {
+		return result;
+	}
+
+	public void setResult(SearchResult result) {
+		this.result = result;
+	}
 }

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	2007-12-22 00:59:25 UTC (rev 2118)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/HTMLPage.java	2007-12-22 02:19:35 UTC (rev 2119)
@@ -383,11 +383,12 @@
 	 */
 	public String includeJspString(String jspPath, 
 			HttpServletRequest httpRequest, HttpServletResponse httpResponse,
-			WaybackRequest wbRequest, SearchResults results) 
+			WaybackRequest wbRequest, SearchResults results, SearchResult result) 
 	throws ServletException, IOException {
 		
 		UIQueryResults uiResults = new UIQueryResults(httpRequest, wbRequest,
 				results, uriConverter);
+		uiResults.setResult(result);
 
 		StringHttpServletResponseWrapper wrappedResponse = 
 			new StringHttpServletResponseWrapper(httpResponse);


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