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

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

Revision: 2644
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2644&view=rev
Author:   bradtofel
Date:     2008-12-05 22:17:55 +0000 (Fri, 05 Dec 2008)

Log Message:
-----------
ACC-53: now we check within the URI converters to (try to) ensure an URL is rewritten at most once -- becomes an idempotent operation.

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlResultURIConverter.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixResultURIConverter.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlResultURIConverter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlResultURIConverter.java	2008-12-05 22:13:14 UTC (rev 2643)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlResultURIConverter.java	2008-12-05 22:17:55 UTC (rev 2644)
@@ -42,10 +42,14 @@
 	 * @see org.archive.wayback.ResultURIConverter#makeReplayURI(java.lang.String, java.lang.String)
 	 */
 	public String makeReplayURI(String datespec, String url) {
+		String suffix = datespec + "/" + url;
 		if(replayURIPrefix == null) {
-			return datespec + "/" + url;
+			return suffix;
 		} else {
-			return replayURIPrefix + datespec + "/" + url;
+			if(url.startsWith(replayURIPrefix)) {
+				return url;
+			}
+			return replayURIPrefix + suffix;
 		}
 	}
 

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixResultURIConverter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixResultURIConverter.java	2008-12-05 22:13:14 UTC (rev 2643)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixResultURIConverter.java	2008-12-05 22:17:55 UTC (rev 2644)
@@ -45,6 +45,9 @@
 	public String makeReplayURI(String datespec, String url) {
 		String replayURI = "";
 		try {
+			if(url.contains(hostPort)) {
+				return url;
+			}
 			URI uri = new URI(url);
 			StringBuilder sb = new StringBuilder(90);
 			sb.append("http://");


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