[Archive-access-cvs] SF.net SVN: archive-access:[3329] trunk/archive-access/projects/wayback/ wayback-webapp/src/main/webapp/WEB-INF/query/Memento.jsp

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

Revision: 3329
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3329&view=rev
Author:   bradtofel
Date:     2010-11-11 05:26:09 +0000 (Thu, 11 Nov 2010)

Log Message:
-----------
BUGFIX: was not sending correct Location redirect URL, was using resultToReplayUrl, which uses AccessPoint ResultURIConverter, which was recently changed to not rewrite URLs. Now explicitly uses an ArchivalUrl object to construct the correct Location.

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/Memento.jsp

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/Memento.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/Memento.jsp	2010-11-11 05:22:40 UTC (rev 3328)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/Memento.jsp	2010-11-11 05:26:09 UTC (rev 3329)
@@ -1,4 +1,5 @@
 <%@ page import="java.util.Date"
+%><%@ page import="org.archive.wayback.archivalurl.ArchivalUrl"
 %><%@ page import="org.archive.wayback.core.UIResults"
 %><%@ page import="org.archive.wayback.util.StringFormatter"
 %><%@ page import="org.archive.wayback.core.WaybackRequest"
@@ -53,7 +54,10 @@
 			+ ">;rel=\"timemap\"; type=\"text/csv\"";
 	String origlink = ", <" + u + ">;rel=\"original\"";
 	String uriPrefix = wbRequest.getAccessPoint().getReplayPrefix();
-	String replayUrl = results.resultToReplayUrl(res);
+	
+    ArchivalUrl aUrl = new ArchivalUrl(wbRequest);
+    String replayUrl = uriPrefix + aUrl.toString(res.getCaptureTimestamp(), 
+            res.getOriginalUrl());
 
 	StringBuffer sb = new StringBuffer();
 


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