archive-access-cvs

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

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

Revision: 2717
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2717&view=rev
Author:   bradtofel
Date:     2009-05-20 02:16:53 +0000 (Wed, 20 May 2009)

Log Message:
-----------
TWEAK: added getter for replayURIPrefix member.

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	2009-05-20 02:12:57 UTC (rev 2716)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlResultURIConverter.java	2009-05-20 02:16:53 UTC (rev 2717)
@@ -59,4 +59,11 @@
 	public void setReplayURIPrefix(String replayURIPrefix) {
 		this.replayURIPrefix = replayURIPrefix;
 	}
+
+	/**
+	 * @return the replayURIPrefix
+	 */
+	public String getReplayURIPrefix() {
+		return replayURIPrefix;
+	}
 }


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

[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.

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

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

Revision: 3534
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3534&view=rev
Author:   bradtofel
Date:     2011-09-06 04:22:06 +0000 (Tue, 06 Sep 2011)
Log Message:
-----------
FEATURE: now implements AccessPointAware, to (hopefully) simplify configuration

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	2011-09-06 04:20:57 UTC (rev 3533)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlResultURIConverter.java	2011-09-06 04:22:06 UTC (rev 3534)
@@ -21,6 +21,8 @@
 
 import org.archive.wayback.ResultURIConverter;
 import org.archive.wayback.util.url.UrlOperations;
+import org.archive.wayback.webapp.AccessPoint;
+import org.archive.wayback.webapp.AccessPointAware;
 
 /**
  *
@@ -28,7 +30,8 @@
  * @author brad
  * @version $Date$, $Revision$
  */
-public class ArchivalUrlResultURIConverter implements ResultURIConverter {
+public class ArchivalUrlResultURIConverter implements ResultURIConverter, 
+	AccessPointAware {
 	/**
 	 * configuration name for URL prefix of replay server
 	 */
@@ -71,4 +74,10 @@
 	public String getReplayURIPrefix() {
 		return replayURIPrefix;
 	}
+
+	public void setAccessPoint(AccessPoint accessPoint) {
+		if(replayURIPrefix == null) {
+			replayURIPrefix = accessPoint.getReplayPrefix();
+		}
+	}
 }

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

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

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

Revision: 3540
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3540&view=rev
Author:   bradtofel
Date:     2011-10-25 00:40:35 +0000 (Tue, 25 Oct 2011)
Log Message:
-----------
LOGGING

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	2011-10-06 20:24:18 UTC (rev 3539)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlResultURIConverter.java	2011-10-25 00:40:35 UTC (rev 3540)
@@ -19,6 +19,8 @@
  */
 package org.archive.wayback.archivalurl;
 
+import java.util.logging.Logger;
+
 import org.archive.wayback.ResultURIConverter;
 import org.archive.wayback.util.url.UrlOperations;
 import org.archive.wayback.webapp.AccessPoint;
@@ -32,6 +34,9 @@
  */
 public class ArchivalUrlResultURIConverter implements ResultURIConverter, 
 	AccessPointAware {
+	private static final Logger LOGGER =
+		Logger.getLogger(ArchivalUrlResultURIConverter.class.getName());
+	
 	/**
 	 * configuration name for URL prefix of replay server
 	 */
@@ -77,7 +82,12 @@
 
 	public void setAccessPoint(AccessPoint accessPoint) {
 		if(replayURIPrefix == null) {
-			replayURIPrefix = accessPoint.getReplayPrefix();
+			String apReplayPrefix = accessPoint.getReplayPrefix(); 
+			LOGGER.warning("No replayURIPrefix configured - using accessPoint:"
+					+ apReplayPrefix);
+			replayURIPrefix = apReplayPrefix;
+		} else {
+			LOGGER.info("replayURIPrefix is configured: " + replayURIPrefix);
 		}
 	}
 }

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