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

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

Revision: 1994
          http://archive-access.svn.sourceforge.net/archive-access/?rev=1994&view=rev
Author:   bradtofel
Date:     2007-09-18 16:43:14 -0700 (Tue, 18 Sep 2007)

Log Message:
-----------
BUGFIX: now remote query type is changed explicitly to urlclosestquery, also construct XML factory in class initializer.

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

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/RemoteResourceIndex.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/RemoteResourceIndex.java	2007-09-18 23:39:45 UTC (rev 1993)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/RemoteResourceIndex.java	2007-09-18 23:43:14 UTC (rev 1994)
@@ -71,7 +71,7 @@
 
 	private String searchUrlBase;
 
-	private DocumentBuilderFactory factory;
+	private DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 
 	private static final String WB_XML_REQUEST_TAGNAME = "request";
 
@@ -109,7 +109,6 @@
     public void init() throws ConfigurationException {
 		LOGGER.info("initializing RemoteCDXIndex...");
 
-		this.factory = DocumentBuilderFactory.newInstance();
 		this.factory.setNamespaceAware(false);
 		LOGGER.info("Using base search url " + this.searchUrlBase);		
 	}
@@ -252,7 +251,12 @@
 
 	protected String getRequestUrl(WaybackRequest wbRequest)
 			throws BadQueryException {
-		return this.searchUrlBase + "?" + wbRequest.getQueryArguments();
+		WaybackRequest tmp = wbRequest.clone();
+		String type = tmp.get(WaybackConstants.REQUEST_TYPE);
+		if(type.equals(WaybackConstants.REQUEST_REPLAY_QUERY)) {
+			tmp.put(WaybackConstants.REQUEST_TYPE, WaybackConstants.REQUEST_URL_QUERY);
+		}
+		return this.searchUrlBase + "?" + tmp.getQueryArguments();
 	}
 
 	// extract the text content of a single tag under a node


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