svn commit: r743280 - in /lucene/solr/trunk/contrib/dataimporthandler: CHANGES.txt src/main/java/org/apache/solr/handler/dataimport/DataConfig.java

[shalin]

Author: shalin
Date: Wed Feb 11 09:30:05 2009
New Revision: 743280

URL: http://svn.apache.org/viewvc?rev=743280&view=rev
Log:
SOLR-1009 -- Repeated column names result in duplicate values

Modified:
    lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt
    
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java

Modified: lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt?rev=743280&r1=743279&r2=743280&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt Wed Feb 11 09:30:05 
2009
@@ -122,6 +122,9 @@
 15.SOLR-1000: FileListEntityProcessor should not apply fileName filter to 
directory names.
               (Fergus McMenemie via shalin)
 
+16.SOLR-1009: Repeated column names result in duplicate values.
+              (Fergus McMenemie, Noble Paul via shalin)
+
 Documentation
 ----------------------
 

Modified: 
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java?rev=743280&r1=743279&r2=743280&view=diff
==============================================================================
--- 
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java
 (original)
+++ 
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java
 Wed Feb 11 09:30:05 2009
@@ -124,7 +124,14 @@
         fields.add(field);
         List<Field> l = colNameVsField.get(field.column);
         if(l == null) l = new ArrayList<Field>();
-        l.add(field);
+        boolean alreadyFound = false;
+        for (Field f : l) {
+          if(f.getName().equals(field.getName())) {
+            alreadyFound = true;
+            break;
+          }
+        }
+        if(!alreadyFound) l.add(field);
         colNameVsField.put(field.column, l);
       }
       n = getChildNodes(element, "entity");