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

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

Revision: 3099
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3099&view=rev
Author:   bradtofel
Date:     2010-05-17 19:48:36 +0000 (Mon, 17 May 2010)

Log Message:
-----------
FEATURE: now strips default ports from urls when rewriting as replay URLs.

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlResultURIConverter.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	2010-05-17 19:45:41 UTC (rev 3098)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlResultURIConverter.java	2010-05-17 19:48:36 UTC (rev 3099)
@@ -25,6 +25,7 @@
 package org.archive.wayback.archivalurl;
 
 import org.archive.wayback.ResultURIConverter;
+import org.archive.wayback.util.url.UrlOperations;
 
 /**
  *
@@ -42,15 +43,24 @@
 	 * @see org.archive.wayback.ResultURIConverter#makeReplayURI(java.lang.String, java.lang.String)
 	 */
 	public String makeReplayURI(String datespec, String url) {
-		String suffix = datespec + "/" + url;
+		StringBuilder sb = null;
+
 		if(replayURIPrefix == null) {
-			return suffix;
-		} else {
-			if(url.startsWith(replayURIPrefix)) {
-				return url;
-			}
-			return replayURIPrefix + suffix;
+			sb = new StringBuilder(url.length() + datespec.length());
+			sb.append(datespec);
+			sb.append("/");
+			sb.append(UrlOperations.stripDefaultPortFromUrl(url));
+			return sb.toString();
 		}
+		if(url.startsWith(replayURIPrefix)) {
+			return url;
+		}
+		sb = new StringBuilder(url.length() + datespec.length());
+		sb.append(replayURIPrefix);
+		sb.append(datespec);
+		sb.append("/");
+		sb.append(UrlOperations.stripDefaultPortFromUrl(url));
+		return sb.toString();
 	}
 
 	/**


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