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

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

Revision: 2315
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2315&view=rev
Author:   bradtofel
Date:     2008-06-24 17:15:28 -0700 (Tue, 24 Jun 2008)

Log Message:
-----------
REFACTOR: Now this class is responsible for UrlCanonicalization, and assumes input records are Identity CDX records.

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

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/bdb/SearchResultToBDBRecordAdapter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/bdb/SearchResultToBDBRecordAdapter.java	2008-06-25 00:14:19 UTC (rev 2314)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/bdb/SearchResultToBDBRecordAdapter.java	2008-06-25 00:15:28 UTC (rev 2315)
@@ -24,6 +24,9 @@
  */
 package org.archive.wayback.resourceindex.bdb;
 
+import java.util.logging.Logger;
+
+import org.apache.commons.httpclient.URIException;
 import org.archive.wayback.UrlCanonicalizer;
 import org.archive.wayback.WaybackConstants;
 import org.archive.wayback.bdb.BDBRecord;
@@ -41,7 +44,9 @@
  */
 public class SearchResultToBDBRecordAdapter implements 
 	Adapter<SearchResult,BDBRecord> {
-
+	private static final Logger LOGGER =
+        Logger.getLogger(SearchResultToBDBRecordAdapter.class.getName());
+	
 	DatabaseEntry key = new DatabaseEntry();
 
 	DatabaseEntry value = new DatabaseEntry();
@@ -65,8 +70,16 @@
 		StringBuilder keySB = new StringBuilder(40);
 		StringBuilder valSB = new StringBuilder(100);
 		
-		
-		keySB.append(result.get(WaybackConstants.RESULT_URL_KEY));
+		String origUrl = result.getAbsoluteUrl();
+		String urlKey;
+		try {
+			urlKey = canonicalizer.urlStringToKey(origUrl);
+		} catch (URIException e) {
+//			e.printStackTrace();
+			LOGGER.warning("FAILED canonicalize(" + origUrl +")");
+			urlKey = origUrl;
+		}
+		keySB.append(urlKey);
 		keySB.append(DELIMITER);
 		keySB.append(result.get(WaybackConstants.RESULT_CAPTURE_DATE));
 		keySB.append(DELIMITER);


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