Merge b75528a into e751233

CHANGES.rst

@@ -4,6 +4,11 @@ Changelog
 5.0.4 (unreleased)
 ------------------
 
+- Fix: Reindexing solr-objects with specific attributes (atomic-update) will remove
+  all indexed attributes on an object if it does not provide this index or if the
+  field is multivalued and the value is empty. (fixes #171)
+  [elioschmutz]
+
 - Use unittest instead unittest2 in test_browser_suggest.py to fix tests.
   [elioschmutz]
 

src/collective/solr/indexer.py

@@ -199,7 +199,7 @@ def index(self, obj, attributes=None):
                     attributes.add(uniqueKey)
 
             data, missing = self.getData(obj, attributes=attributes)
-            if not data:
+            if not data or not set(data.keys()) - set([uniqueKey]):
                 return          # don't index with no data...
             prepareData(data)
             if data.get(uniqueKey, None) is not None and not missing:

src/collective/solr/solr.py

@@ -257,8 +257,14 @@ def add(self, boost_values=None, atomic_updates=True, **fields):
                 tmpl = tmpl.replace(' update="set"', '')
 
             if isinstance(v, (list, tuple)):  # multi-valued
-                for value in v:
-                    lst.append(tmpl % self.escapeVal(value))
+                if v:
+                    for value in v:
+                        lst.append(tmpl % self.escapeVal(value))
+                else:
+                    # Add an empty element for empty lists/tuples.
+                    # Otherwise all indexes gets removed if you update an empty
+                    # multivalued attribute.
+                    lst.append(tmpl % '')
             else:
                 lst.append(tmpl % self.escapeVal(v))
         lst.append('</doc>')

src/collective/solr/tests/test_server.py

@@ -2,7 +2,6 @@
 from Acquisition import aq_base
 from Acquisition import aq_parent
 from DateTime import DateTime
-from Missing import MV
 from Products.CMFCore.utils import getToolByName
 from collective.indexing.queue import getQueue
 from collective.indexing.queue import processQueue
@@ -1215,7 +1214,7 @@ def testFlareHasDataForAllMetadataColumns(self):
         self.maintenance.reindex()
         results = solrSearchResults(SearchableText='Welcome')
         self.assertEqual(len(results), 1)
-        self.assertEqual(results[0].get('Subject'), MV)
+        self.assertEqual(results[0].get('Subject'), [''])
         schema = self.search.getManager().getSchema()
         expected = set(list(schema.stored) + ['score'])     # score gets added
         self.assertEqual(set(results[0].keys()), expected)