rer.solrpush 1.3.5__tar.gz → 1.3.7__tar.gz

{rer.solrpush-1.3.5 → rer.solrpush-1.3.7}/CHANGES.rst

@@ -2,6 +2,20 @@ Changelog
 =========
 
 
+1.3.7 (2024-12-09)
+------------------
+
+- Fix handle attachements when indexing a new content.
+  [cekk]
+
+
+1.3.6 (2024-12-06)
+------------------
+
+- Fix handle attachements when indexing a new content.
+  [cekk]
+
+
 1.3.5 (2024-12-05)
 ------------------
 

{rer.solrpush-1.3.5 → rer.solrpush-1.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rer.solrpush
-Version: 1.3.5
+Version: 1.3.7
 Summary: Prodotto per Regione Emilia-Romagna relativo all'indicizzazione dei contenuti con solr
 Home-page: https://github.com/collective/rer.solrpush
 Author: RedTurtle
@@ -241,6 +241,20 @@ Changelog
 =========
 
 
+1.3.7 (2024-12-09)
+------------------
+
+- Fix handle attachements when indexing a new content.
+  [cekk]
+
+
+1.3.6 (2024-12-06)
+------------------
+
+- Fix handle attachements when indexing a new content.
+  [cekk]
+
+
 1.3.5 (2024-12-05)
 ------------------
 

{rer.solrpush-1.3.5 → rer.solrpush-1.3.7}/setup.py

@@ -16,7 +16,7 @@ long_description = "\n\n".join(
 
 setup(
     name="rer.solrpush",
-    version="1.3.5",
+    version="1.3.7",
     description="Prodotto per Regione Emilia-Romagna relativo all'indicizzazione dei contenuti con solr",
     long_description=long_description,
     # Get more from https://pypi.python.org/pypi?%3Aaction=list_classifiers

{rer.solrpush-1.3.5 → rer.solrpush-1.3.7}/src/rer/solrpush/adapters/file.py

@@ -2,6 +2,8 @@
 from plone import api
 from rer.solrpush.interfaces.adapter import IExtractFileFromTika
 from zope.interface import implementer
+from ZODB.POSException import POSKeyError
+from ZODB.POSException import ReadConflictError
 
 try:
     from collective.limitfilesizepanel.interfaces import ILimitFileSizePanel
@@ -34,8 +36,7 @@ class FileExtractor(object):
         return max_size * 1024 * 1024
 
     def get_file_to_index(self):
-        """
-        """
+        """ """
         file_obj = getattr(self.context, "file", None)
         if not file_obj:
             return None
@@ -49,4 +50,9 @@ class FileExtractor(object):
                 file_obj.filename,
             )
             return None
-        return file_obj.data
+        try:
+            return file_obj.data
+        except (POSKeyError, ReadConflictError):
+            # this is raised if we are creating a new object, because there isn't the blob yet.
+            # this is not a problem, because the file is in dictionary
+            return None

{rer.solrpush-1.3.5 → rer.solrpush-1.3.7}/src/rer/solrpush/utils/solr_indexer.py

@@ -108,7 +108,7 @@ def can_index(item):
     return is_right_portal_type(item)
 
 
-def create_index_dict(item):
+def create_index_dict(item, default={}):
     """Restituisce un dizionario pronto per essere 'mandato' a SOLR per
     l'indicizzazione.
     """
@@ -128,7 +128,13 @@ def create_index_dict(item):
         field_type = field_infos.get("type")
         if six.PY2:
             field = field.encode("ascii")
-        value = getattr(adapter, field, None)
+        try:
+            value = getattr(adapter, field, None)
+        except Exception:
+            # if we are in creation and indexing a content with a File, SearchableText
+            # raise PosKeyError because it tries to read the file too, but the blob
+            # isn't created yet.
+            value = default.get(field, None)
         if not value and value is not False:
             continue
         if callable(value):
@@ -245,8 +251,15 @@ def push_to_solr(item_or_obj):
             context = obj
     if not can_index(context):
         return False
-    index_dict = create_index_dict(context)
-    attachment = index_dict.pop("attachment", None)
+    index_dict = create_index_dict(item=context, default=item_or_obj)
+    attachment = None
+    if index_dict.get("attachment", None):
+        attachment = index_dict.pop("attachment", None)
+    else:
+        if isinstance(item_or_obj, dict) and item_or_obj.get(
+            "attachment", None
+        ):
+            attachment = item_or_obj["attachment"]
     if attachment:
         add_with_attachment(
             solr=solr, attachment=attachment, fields=index_dict
@@ -276,7 +289,7 @@ def remove_from_solr(uid):
         logger.error(err)
         message = _(
             "content_remove_error",
-            default=u"There was a problem removing this content from SOLR. "
+            default="There was a problem removing this content from SOLR. "
             " Please contact site administrator.",
         )
         api.portal.show_message(

{rer.solrpush-1.3.5 → rer.solrpush-1.3.7}/src/rer.solrpush.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rer.solrpush
-Version: 1.3.5
+Version: 1.3.7
 Summary: Prodotto per Regione Emilia-Romagna relativo all'indicizzazione dei contenuti con solr
 Home-page: https://github.com/collective/rer.solrpush
 Author: RedTurtle
@@ -241,6 +241,20 @@ Changelog
 =========
 
 
+1.3.7 (2024-12-09)
+------------------
+
+- Fix handle attachements when indexing a new content.
+  [cekk]
+
+
+1.3.6 (2024-12-06)
+------------------
+
+- Fix handle attachements when indexing a new content.
+  [cekk]
+
+
 1.3.5 (2024-12-05)
 ------------------