Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access:[3289] trunk/archive-access/projects/wayback
|
From: <bra...@us...> - 2010-10-21 17:33:36
|
Revision: 3289
http://archive-access.svn.sourceforge.net/archive-access/?rev=3289&view=rev
Author: bradtofel
Date: 2010-10-21 17:33:30 +0000 (Thu, 21 Oct 2010)
Log Message:
-----------
BUGFIX(unreported) corrected rewriting of URLs embedded in CSS, which has no concept of <base href="">. Now for memento, we make URLs absolute, but do not prepend any prefix or date - relying on the client plugin to intercept and redirect the in-browser requests. This required a non-ArchivalUrlResultURIConverter, so many other codes which pulled the replay prefix from that object now pull it from the AccessPoint.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/memento/MementoReplayRendererDecorator.java
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/ORE.jsp
Added Paths:
-----------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/memento/MementoResultURIConverter.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/memento/MementoReplayRendererDecorator.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/memento/MementoReplayRendererDecorator.java 2010-10-21 00:37:52 UTC (rev 3288)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/memento/MementoReplayRendererDecorator.java 2010-10-21 17:33:30 UTC (rev 3289)
@@ -80,10 +80,8 @@
SimpleDateFormat formatterk = new SimpleDateFormat("yyyyMMddHHmmss");
formatterk.setTimeZone(tzo);
Properties apProps = wbRequest.getAccessPoint().getConfigs();
- ArchivalUrlResultURIConverter aUriConverter =
- (ArchivalUrlResultURIConverter) uriConverter;
Date closestDate = result.getCaptureDate();
- String uriPrefix = aUriConverter.getReplayURIPrefix();
+ String uriPrefix = wbRequest.getAccessPoint().getReplayPrefix();
String agguri = apProps.getProperty("aggregationPrefix")
+ "timebundle/" + u;
String timemap = " , <"
Added: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/memento/MementoResultURIConverter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/memento/MementoResultURIConverter.java (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/memento/MementoResultURIConverter.java 2010-10-21 17:33:30 UTC (rev 3289)
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the Wayback archival access software
+ * (http://archive-access.sourceforge.net/projects/wayback/).
+ *
+ * Licensed to the Internet Archive (IA) by one or more individual
+ * contributors.
+ *
+ * The IA licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.archive.wayback.memento;
+
+import org.archive.wayback.ResultURIConverter;
+import org.archive.wayback.util.url.UrlOperations;
+
+/**
+ * @author brad
+ *
+ */
+public class MementoResultURIConverter implements ResultURIConverter {
+ public String makeReplayURI(String datespec, String url) {
+ return UrlOperations.stripDefaultPortFromUrl(url);
+ }
+}
Property changes on: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/memento/MementoResultURIConverter.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Revision Id
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-10-21 00:37:52 UTC (rev 3288)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/Memento.jsp 2010-10-21 17:33:30 UTC (rev 3289)
@@ -52,9 +52,7 @@
+ "timemap/link/" + u
+ ">;rel=\"timemap\"; type=\"text/csv\"";
String origlink = ", <" + u + ">;rel=\"original\"";
- ArchivalUrlResultURIConverter uriconverter = (ArchivalUrlResultURIConverter) results
- .getURIConverter();
- String uriPrefix = uriconverter.getReplayURIPrefix();
+ String uriPrefix = wbRequest.getAccessPoint().getReplayPrefix();
String replayUrl = results.resultToReplayUrl(res);
StringBuffer sb = new StringBuffer();
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/ORE.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/ORE.jsp 2010-10-21 00:37:52 UTC (rev 3288)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/ORE.jsp 2010-10-21 17:33:30 UTC (rev 3289)
@@ -38,9 +38,7 @@
CaptureSearchResults cResults = results.getCaptureResults();
CaptureSearchResult res = cResults.getClosest();
- ArchivalUrlResultURIConverter uriconverter = (ArchivalUrlResultURIConverter) results
- .getURIConverter();
- String uriPrefix = uriconverter.getReplayURIPrefix();
+ String uriPrefix = wbRequest.getAccessPoint().getReplayPrefix();
String u = wbRequest.getRequestUrl();
String agguri = uriPrefix + "timebundle/" + u;
String format = wbRequest.get("format");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
