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

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

Revision: 3505
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3505&view=rev
Author:   bradtofel
Date:     2011-08-16 11:05:35 +0000 (Tue, 16 Aug 2011)

Log Message:
-----------
BUGFIX: made automatic bouncing from a FORM query to the "clean" archival URL format optional - over a year ago, it was added, made default, and not disablable.

Modified Paths:
--------------
    branches/wayback-1_6_2/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/ArchivalUrlFormRequestParser.java
    branches/wayback-1_6_2/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java

Modified: branches/wayback-1_6_2/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/ArchivalUrlFormRequestParser.java
===================================================================
--- branches/wayback-1_6_2/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/ArchivalUrlFormRequestParser.java	2011-08-16 10:49:16 UTC (rev 3504)
+++ branches/wayback-1_6_2/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/ArchivalUrlFormRequestParser.java	2011-08-16 11:05:35 UTC (rev 3505)
@@ -54,12 +54,14 @@
 				accessPoint.translateRequestPathQuery(httpRequest);
 			ArchivalUrl aUrl = new ArchivalUrl(wbRequest);
 			String bestPath = aUrl.toString();
-			if(!bestPath.equals(requestPath)) {
-				String betterURI = (wbRequest.isReplayRequest() ? 
-						accessPoint.getReplayPrefix() : 
-							accessPoint.getQueryPrefix()) 
-						+ bestPath;
-				throw new BetterRequestException(betterURI);
+			if(accessPoint.isForceCleanQueries()) {
+				if(!bestPath.equals(requestPath)) {
+					String betterURI = (wbRequest.isReplayRequest() ? 
+							accessPoint.getReplayPrefix() : 
+								accessPoint.getQueryPrefix()) 
+							+ bestPath;
+					throw new BetterRequestException(betterURI);
+				}
 			}
 		}
 		return wbRequest;

Modified: branches/wayback-1_6_2/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
===================================================================
--- branches/wayback-1_6_2/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java	2011-08-16 10:49:16 UTC (rev 3504)
+++ branches/wayback-1_6_2/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java	2011-08-16 11:05:35 UTC (rev 3505)
@@ -95,6 +95,7 @@
 	private boolean serveStatic = true;
 	private boolean bounceToReplayPrefix = false;
 	private boolean bounceToQueryPrefix = false;
+	private boolean forceCleanQueries = false;
 
 	private String liveWebPrefix = null;
 	private String staticPrefix = null;
@@ -848,4 +849,18 @@
 	public void setBounceToQueryPrefix(boolean bounceToQueryPrefix) {
 		this.bounceToQueryPrefix = bounceToQueryPrefix;
 	}
+
+	/**
+	 * @return the forceCleanQueries
+	 */
+	public boolean isForceCleanQueries() {
+		return forceCleanQueries;
+	}
+
+	/**
+	 * @param forceCleanQueries the forceCleanQueries to set
+	 */
+	public void setForceCleanQueries(boolean forceCleanQueries) {
+		this.forceCleanQueries = forceCleanQueries;
+	}
 }


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