fix adder where binary is not a blob (test)

collective · Sep 25, 2016 · cc3e044 · cc3e044
1 parent 49fc70c
commit cc3e044
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/collective/solr/indexer.py b/src/collective/solr/indexer.py
@@ -121,6 +121,8 @@ def getblob(self):
 
     def getpath(self):
         blob = self.getblob()
+        if blob is None:
+            return None
         try:
             path = blob.committed()
         except BlobError:
@@ -130,6 +132,9 @@ def getpath(self):
 
     def __call__(self, conn, **data):
         postdata = {}
+        path = self.getpath()
+        if path is None:
+            super(BinaryAdder, self).__call__(conn, **data)
         postdata['stream.file'] = self.getpath()
         postdata['stream.contentType'] = data.get(
             'content_type',
@@ -156,7 +161,7 @@ class DXFileBinaryAdder(BinaryAdder):
 
     def getblob(self):
         field = getattr(self.context, self.fieldname, None)
-        return field._blob
+        return getattr(field, '_blob', None)
 
 
 class DXImageBinaryAdder(DXFileBinaryAdder):