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

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

Revision: 2561
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2561&view=rev
Author:   bradtofel
Date:     2008-08-19 02:49:03 +0000 (Tue, 19 Aug 2008)

Log Message:
-----------
TWEAK: changed values for type of request - capturequery is now back to "urlquery" and "urlquery" is now "prefixquery".
TWEAK: cookie values no longer override provided/existing values.

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

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java	2008-08-19 02:46:23 UTC (rev 2560)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java	2008-08-19 02:49:03 UTC (rev 2561)
@@ -112,12 +112,12 @@
 	 * REQUEST_TYPE option indicating a query against the ResourceIndex for 
 	 * captures of URLs matching the REQUEST_URL 
 	 */
-	public static final String REQUEST_CAPTURE_QUERY = "capturequery";
+	public static final String REQUEST_CAPTURE_QUERY = "urlquery";
 	/**
 	 * REQUEST_TYPE option indicating a query against the ResourceIndex for 
 	 * summaries of URLs prefixed with the REQUEST_URL 
 	 */
-	public static final String REQUEST_URL_QUERY = "urlquery";
+	public static final String REQUEST_URL_QUERY = "prefixquery";
 	/*
 	 * **********************
 	 * /REQUEST TYPE CONSTANTS 
@@ -744,7 +744,12 @@
 		Cookie[] cookies = httpRequest.getCookies();
 		if(cookies != null) {
 			for(Cookie cookie : cookies) {
-				put(cookie.getName(),cookie.getValue());
+				String name = cookie.getName();
+				String value = cookie.getValue();
+				String oldVal = get(name);
+				if(oldVal == null || oldVal.length() == 0) {
+					put(name,value);
+				}
 			}
 		}
 	}


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