[Archive-access-cvs] SF.net SVN: archive-access:[2624]

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

Revision: 2624
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2624&view=rev
Author:   bradtofel
Date:     2008-10-28 18:15:41 +0000 (Tue, 28 Oct 2008)

Log Message:
-----------
BUGFIX(ACC-36): Timeline was using replay date from WaybackRequest, not capture date from SearchResult.

Modified Paths:
--------------
    branches/wayback-1_4_1/wayback-webapp/src/main/webapp/WEB-INF/replay/Timeline.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Timeline.jsp

Modified: branches/wayback-1_4_1/wayback-webapp/src/main/webapp/WEB-INF/replay/Timeline.jsp
===================================================================
--- branches/wayback-1_4_1/wayback-webapp/src/main/webapp/WEB-INF/replay/Timeline.jsp	2008-10-28 02:08:53 UTC (rev 2623)
+++ branches/wayback-1_4_1/wayback-webapp/src/main/webapp/WEB-INF/replay/Timeline.jsp	2008-10-28 18:15:41 UTC (rev 2624)
@@ -14,16 +14,15 @@
 <jsp:include page="/WEB-INF/template/CookieJS.jsp" flush="true" />
 <%
 
-String contextRoot = request.getScheme() + "://" + request.getServerName() + ":" 
-	+ request.getServerPort() + request.getContextPath();
 
 UIResults results = UIResults.extractReplay(request);
+String contextRoot = results.getWbRequest().getContextPrefix();
 WaybackRequest wbRequest = results.getWbRequest();
 StringFormatter fmt = wbRequest.getFormatter();
 CaptureSearchResults cResults = results.getCaptureResults();
 
-String exactDateStr = wbRequest.getReplayTimestamp();
-Date exactDate = wbRequest.getReplayDate();
+String exactDateStr = results.getResult().getCaptureTimestamp();
+Date exactDate = results.getResult().getCaptureDate();
 String searchUrl = wbRequest.getRequestUrl();
 String resolution = wbRequest.getTimelineResolution();
 

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Timeline.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Timeline.jsp	2008-10-28 02:08:53 UTC (rev 2623)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Timeline.jsp	2008-10-28 18:15:41 UTC (rev 2624)
@@ -14,16 +14,15 @@
 <jsp:include page="/WEB-INF/template/CookieJS.jsp" flush="true" />
 <%
 
-String contextRoot = request.getScheme() + "://" + request.getServerName() + ":" 
-	+ request.getServerPort() + request.getContextPath();
 
 UIResults results = UIResults.extractReplay(request);
+String contextRoot = results.getWbRequest().getContextPrefix();
 WaybackRequest wbRequest = results.getWbRequest();
 StringFormatter fmt = wbRequest.getFormatter();
 CaptureSearchResults cResults = results.getCaptureResults();
 
-String exactDateStr = wbRequest.getReplayTimestamp();
-Date exactDate = wbRequest.getReplayDate();
+String exactDateStr = results.getResult().getCaptureTimestamp();
+Date exactDate = results.getResult().getCaptureDate();
 String searchUrl = wbRequest.getRequestUrl();
 String resolution = wbRequest.getTimelineResolution();
 


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