You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by sh...@apache.org on 2009/02/25 09:31:25 UTC
svn commit: r747707 - in /lucene/solr/trunk/contrib/dataimporthandler:
CHANGES.txt src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
Author: shalin
Date: Wed Feb 25 08:31:25 2009
New Revision: 747707
URL: http://svn.apache.org/viewvc?rev=747707&view=rev
Log:
SOLR-1037 -- DIH should not add null values in a row returned by EntityProcessor to documents.
Modified:
lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
Modified: lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt?rev=747707&r1=747706&r2=747707&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt Wed Feb 25 08:31:25 2009
@@ -152,6 +152,9 @@
18.SOLR-1024: Calling abort on DataImportHandler import commits data instead of calling rollback.
(shalin)
+19.SOLR-1037: DIH should not add null values in a row returned by EntityProcessor to documents.
+ (shalin)
+
Documentation
----------------------
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java?rev=747707&r1=747706&r2=747707&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java Wed Feb 25 08:31:25 2009
@@ -460,19 +460,24 @@
Collection collection = (Collection) value;
if (multiValued) {
for (Object o : collection) {
- doc.addField(name, o, boost);
+ if (o != null)
+ doc.addField(name, o, boost);
}
} else {
if (doc.getField(name) == null)
for (Object o : collection) {
- doc.addField(name, o, boost);
- break;
+ if (o != null) {
+ doc.addField(name, o, boost);
+ break;
+ }
}
}
} else if (multiValued) {
- doc.addField(name, value, boost);
+ if (value != null) {
+ doc.addField(name, value, boost);
+ }
} else {
- if (doc.getField(name) == null)
+ if (doc.getField(name) == null && value != null)
doc.addField(name, value, boost);
}
}