[Archive-access-cvs] SF.net SVN: archive-access: [2432] branches/wayback-1_2_2/wayback/ wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java

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

Revision: 2432
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2432&view=rev
Author:   bradtofel
Date:     2008-07-13 18:39:52 -0700 (Sun, 13 Jul 2008)

Log Message:
-----------
BUGFIX: moved extract HTTP request call to beginning of fixup.
IMPROVEMENT (ACC-25): now we allow "http:/" instead of just "http://" to begin URLs.

Modified Paths:
--------------
    branches/wayback-1_2_2/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java

Modified: branches/wayback-1_2_2/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
===================================================================
--- branches/wayback-1_2_2/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java	2008-07-14 01:19:31 UTC (rev 2431)
+++ branches/wayback-1_2_2/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java	2008-07-14 01:39:52 UTC (rev 2432)
@@ -259,6 +259,7 @@
 	 * @param httpRequest
 	 */
 	public void fixup(HttpServletRequest httpRequest) {
+		extractHttpRequestInfo(httpRequest);
 		String startDate = get(WaybackConstants.REQUEST_START_DATE);
 		String endDate = get(WaybackConstants.REQUEST_END_DATE);
 		String exactDate = get(WaybackConstants.REQUEST_EXACT_DATE);
@@ -287,7 +288,6 @@
 			put(WaybackConstants.REQUEST_EXACT_DATE, Timestamp
 					.padEndDateStr(exactDate));
 		}
-		extractHttpRequestInfo(httpRequest);
 	}
 
 	/**
@@ -346,8 +346,12 @@
      * @throws URIException
      */
 	public void setRequestUrl(String urlStr) throws URIException {
-	    if (!urlStr.startsWith("http://")) {
-	        urlStr = "http://" + urlStr;
+		if (!urlStr.startsWith("http://")) {
+	    	if(urlStr.startsWith("http:/")) {
+	    		urlStr = "http://" + urlStr.substring(6);
+	    	} else {
+	    		urlStr = "http://" + urlStr;
+	    	}
 	    }
         // If its not http, next line throws exception. TODO: Fix.
 	    UURI requestURI = UURIFactory.getInstance(urlStr);


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