rer.solrpush 1.5.2__tar.gz → 1.5.4__tar.gz

{rer.solrpush-1.5.2 → rer.solrpush-1.5.4}/CHANGES.rst

@@ -2,6 +2,20 @@ Changelog
 =========
 
 
+1.5.4 (2024-12-06)
+------------------
+
+- Fix handle attachements when indexing a new File.
+  [cekk]
+
+
+1.5.3 (2024-12-06)
+------------------
+
+- Fix handle attachements when indexing a new content and make exception more generic.
+  [cekk]
+
+
 1.5.2 (2024-12-06)
 ------------------
 

{rer.solrpush-1.5.2 → rer.solrpush-1.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rer.solrpush
-Version: 1.5.2
+Version: 1.5.4
 Summary: Prodotto per Regione Emilia-Romagna relativo all'indicizzazione dei contenuti con solr
 Home-page: https://github.com/collective/rer.solrpush
 Author: RedTurtle
@@ -244,6 +244,20 @@ Changelog
 =========
 
 
+1.5.4 (2024-12-06)
+------------------
+
+- Fix handle attachements when indexing a new File.
+  [cekk]
+
+
+1.5.3 (2024-12-06)
+------------------
+
+- Fix handle attachements when indexing a new content and make exception more generic.
+  [cekk]
+
+
 1.5.2 (2024-12-06)
 ------------------
 

{rer.solrpush-1.5.2 → rer.solrpush-1.5.4}/setup.py

@@ -16,7 +16,7 @@ long_description = "\n\n".join(
 
 setup(
     name="rer.solrpush",
-    version="1.5.2",
+    version="1.5.4",
     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.5.2 → rer.solrpush-1.5.4}/src/rer/solrpush/adapters/file.py

@@ -2,8 +2,6 @@
 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
@@ -53,7 +51,9 @@ class FileExtractor(object):
             return None
         try:
             return file_obj.data
-        except (POSKeyError, ReadConflictError):
+        except Exception as e:
+            # generic because can be a PoskeyError raised also by RelStorage and we could not have it here.
             # 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
+            logger.debug(e)
             return None

{rer.solrpush-1.5.2 → rer.solrpush-1.5.4}/src/rer/solrpush/utils/solr_indexer.py

@@ -130,7 +130,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.
     """
@@ -148,7 +148,13 @@ def create_index_dict(item):
             # repsonses and can be copied in solr configuration.
             continue
         field_type = field_infos.get("type")
-        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):
@@ -254,7 +260,7 @@ def push_to_solr(item_or_obj):
             context = obj
     if not can_index(context):
         return False
-    index_dict = create_index_dict(context)
+    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)

{rer.solrpush-1.5.2 → rer.solrpush-1.5.4}/src/rer.solrpush.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rer.solrpush
-Version: 1.5.2
+Version: 1.5.4
 Summary: Prodotto per Regione Emilia-Romagna relativo all'indicizzazione dei contenuti con solr
 Home-page: https://github.com/collective/rer.solrpush
 Author: RedTurtle
@@ -244,6 +244,20 @@ Changelog
 =========
 
 
+1.5.4 (2024-12-06)
+------------------
+
+- Fix handle attachements when indexing a new File.
+  [cekk]
+
+
+1.5.3 (2024-12-06)
+------------------
+
+- Fix handle attachements when indexing a new content and make exception more generic.
+  [cekk]
+
+
 1.5.2 (2024-12-06)
 ------------------