rer.solrpush 1.3.4__tar.gz → 1.3.6__tar.gz

{rer.solrpush-1.3.4 → rer.solrpush-1.3.6}/CHANGES.rst

@@ -2,6 +2,20 @@ Changelog
 =========
 
 
+1.3.6 (2024-12-06)
+------------------
+
+- Fix handle attachements when indexing a new content.
+  [cekk]
+
+
+1.3.5 (2024-12-05)
+------------------
+
+- Reload schema from solr with upgrade-step.
+  [cekk]
+
+
 1.3.4 (2024-12-05)
 ------------------
 

{rer.solrpush-1.3.4 → rer.solrpush-1.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rer.solrpush
-Version: 1.3.4
+Version: 1.3.6
 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.6 (2024-12-06)
+------------------
+
+- Fix handle attachements when indexing a new content.
+  [cekk]
+
+
+1.3.5 (2024-12-05)
+------------------
+
+- Reload schema from solr with upgrade-step.
+  [cekk]
+
+
 1.3.4 (2024-12-05)
 ------------------
 

{rer.solrpush-1.3.4 → rer.solrpush-1.3.6}/setup.py

@@ -16,7 +16,7 @@ long_description = "\n\n".join(
 
 setup(
     name="rer.solrpush",
-    version="1.3.4",
+    version="1.3.6",
     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.4 → rer.solrpush-1.3.6}/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.4 → rer.solrpush-1.3.6}/src/rer/solrpush/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
-  <version>2000</version>
+  <version>2001</version>
   <dependencies>
     <dependency>profile-collective.z3cform.jsonwidget:default</dependency>
     <dependency>profile-plone.restapi:default</dependency>

{rer.solrpush-1.3.4 → rer.solrpush-1.3.6}/src/rer/solrpush/upgrades.py

@@ -74,3 +74,8 @@ def to_1600(context):
         except Exception:
             # solr can't index it, pass
             continue
+
+
+def to_2001(context):
+    # reload schema
+    init_solr_push()

{rer.solrpush-1.3.4 → rer.solrpush-1.3.6}/src/rer/solrpush/upgrades.zcml

@@ -83,4 +83,12 @@
     profile="rer.solrpush:default"
     handler=".upgrades.update_registry"
     />  
+  <genericsetup:upgradeStep
+    source="2000"
+    destination="2001"
+    title="Reload schema from solr"
+    description=""
+    profile="rer.solrpush:default"
+    handler=".upgrades.to_2001"
+    />  
 </configure>

{rer.solrpush-1.3.4 → rer.solrpush-1.3.6}/src/rer/solrpush/utils/solr_indexer.py

@@ -246,7 +246,14 @@ def push_to_solr(item_or_obj):
     if not can_index(context):
         return False
     index_dict = create_index_dict(context)
-    attachment = index_dict.pop("attachment", None)
+    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

{rer.solrpush-1.3.4 → rer.solrpush-1.3.6}/src/rer.solrpush.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rer.solrpush
-Version: 1.3.4
+Version: 1.3.6
 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.6 (2024-12-06)
+------------------
+
+- Fix handle attachements when indexing a new content.
+  [cekk]
+
+
+1.3.5 (2024-12-05)
+------------------
+
+- Reload schema from solr with upgrade-step.
+  [cekk]
+
+
 1.3.4 (2024-12-05)
 ------------------