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

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

Revision: 1775
          http://archive-access.svn.sourceforge.net/archive-access/?rev=1775&view=rev
Author:   bradtofel
Date:     2007-07-16 15:37:32 -0700 (Mon, 16 Jul 2007)

Log Message:
-----------
REFACTOR: moved url resolving code here from various other occurences

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/UrlCanonicalizer.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/UrlCanonicalizer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/UrlCanonicalizer.java	2007-07-16 22:36:05 UTC (rev 1774)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/UrlCanonicalizer.java	2007-07-16 22:37:32 UTC (rev 1775)
@@ -303,6 +303,28 @@
 		
 		return (m != null) && m.matches();
 	}
+	
+	/**
+	 * @param baseUrl
+	 * @param url
+	 * @return url resolved against baseUrl, unless it is absolute already
+	 */
+	public static String resolveUrl(String baseUrl, String url) {
+		// TODO: this only works for http://
+		if(url.startsWith("http://")) {
+			return url;
+		}
+		UURI absBaseURI;
+		UURI resolvedURI = null;
+		try {
+			absBaseURI = UURIFactory.getInstance(baseUrl);
+			resolvedURI = UURIFactory.getInstance(absBaseURI, url);
+		} catch (URIException e) {
+			e.printStackTrace();
+			return url;
+		}
+		return resolvedURI.getEscapedURI();
+	}
 
 	private static void USAGE() {
 		System.err.println("Usage: [-f FIELD] [-d DELIM]");


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