svn commit: r1465522 - in /nutch/branches/2.x: CHANGES.txt src/java/org/apache/nutch/indexer/IndexUtil.java

[lewismc]

Author: lewismc
Date: Mon Apr  8 00:36:59 2013
New Revision: 1465522

URL: http://svn.apache.org/r1465522
Log:
NUTCH-1532 Replace 'segment' mapping field with batchId

Modified:
    nutch/branches/2.x/CHANGES.txt
    nutch/branches/2.x/src/java/org/apache/nutch/indexer/IndexUtil.java

Modified: nutch/branches/2.x/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/nutch/branches/2.x/CHANGES.txt?rev=1465522&r1=1465521&r2=1465522&view=diff
==============================================================================
--- nutch/branches/2.x/CHANGES.txt (original)
+++ nutch/branches/2.x/CHANGES.txt Mon Apr  8 00:36:59 2013
@@ -14,7 +14,7 @@ Release 2.2 - Current Development
 
 * NUTCH-1038 Port IndexingFiltersChecker to 2.0 (snagel via lewismc)
 
-* NUTCH-1532 Replace 'segment' mapping field with batchId (Feng +via lewismc)
+* NUTCH-1532 Replace 'segment' mapping field with batchId (patches v2 + v3) 
(Feng +via lewismc)
 
 * NUTCH-1533 Implement getPrevModifiedTime(), setPrevModifiedTime(), 
getBatchId() and setBatchId() accessors in o.a.n.storage.WebPage (Feng via 
lewismc)
 

Modified: nutch/branches/2.x/src/java/org/apache/nutch/indexer/IndexUtil.java
URL: 
http://svn.apache.org/viewvc/nutch/branches/2.x/src/java/org/apache/nutch/indexer/IndexUtil.java?rev=1465522&r1=1465521&r2=1465522&view=diff
==============================================================================
--- nutch/branches/2.x/src/java/org/apache/nutch/indexer/IndexUtil.java 
(original)
+++ nutch/branches/2.x/src/java/org/apache/nutch/indexer/IndexUtil.java Mon Apr 
 8 00:36:59 2013
@@ -63,7 +63,9 @@ public class IndexUtil {
     NutchDocument doc = new NutchDocument();
     doc.add("id", key);
     doc.add("digest", StringUtil.toHexString(page.getSignature().array()));
-    doc.add("batchId", page.getBatchId().toString());
+    if (page.getBatchId() != null) {
+      doc.add("batchId", page.getBatchId().toString());
+    }
     
     String url = TableUtil.unreverseUrl(key);