rer.solrpush 1.4.1__tar.gz → 1.4.3__tar.gz

{rer.solrpush-1.4.1 → rer.solrpush-1.4.3}/CHANGES.rst

@@ -2,6 +2,20 @@ Changelog
 =========
 
 
+1.4.3 (2024-10-11)
+------------------
+
+- Fix SolrIndexProcessor logic: avoid not needed reindexes when we are reindexing objects with indexes not in SOLR.
+  [cekk]
+
+
+1.4.2 (2024-08-08)
+------------------
+
+- Do not break vocabularies if solr is deactivated and not configured.
+  [cekk]
+
+
 1.4.1 (2024-07-29)
 ------------------
 

{rer.solrpush-1.4.1 → rer.solrpush-1.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rer.solrpush
-Version: 1.4.1
+Version: 1.4.3
 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.4.3 (2024-10-11)
+------------------
+
+- Fix SolrIndexProcessor logic: avoid not needed reindexes when we are reindexing objects with indexes not in SOLR.
+  [cekk]
+
+
+1.4.2 (2024-08-08)
+------------------
+
+- Do not break vocabularies if solr is deactivated and not configured.
+  [cekk]
+
+
 1.4.1 (2024-07-29)
 ------------------
 

{rer.solrpush-1.4.1 → rer.solrpush-1.4.3}/setup.py

@@ -16,7 +16,7 @@ long_description = "\n\n".join(
 
 setup(
     name="rer.solrpush",
-    version="1.4.1",
+    version="1.4.3",
     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.4.1 → rer.solrpush-1.4.3}/src/rer/solrpush/indexer.py

@@ -20,7 +20,7 @@ from zope.globalrequest import getRequest
 from zope.interface import implementer
 
 import logging
-
+import json
 
 logger = logging.getLogger(__name__)
 
@@ -45,13 +45,17 @@ class SolrIndexProcessor(object):
 
     @property
     def index_fields(self):
-        return api.portal.get_registry_record(
-            "index_fields", interface=IRerSolrpushSettings, default=None
+        indexes = api.portal.get_registry_record(
+            "index_fields", interface=IRerSolrpushSettings, default="{}"
         )
+        if not indexes:
+            return {}
+        return json.loads(indexes)
 
     def index(self, obj, attributes=None):
         if (
             self.active
+            and self.check_attributes(attributes=attributes)  # noqa
             and getattr(obj, "showinsearch", True)  # noqa
             and can_index(obj)  # noqa
         ):
@@ -63,8 +67,28 @@ class SolrIndexProcessor(object):
             return True
         return False
 
+    def check_attributes(self, attributes):
+        """
+        If we are reindexing some indexes that should not be indexed on SOLR,
+        we don't have to update it.
+        """
+        if not attributes:
+            return True
+        index_fields = api.portal.get_registry_record(
+            "index_fields", interface=IRerSolrpushSettings, default="{}"
+        )
+        if not index_fields:
+            return False
+        index_fields = json.loads(index_fields)
+
+        found = False
+        for index in attributes:
+            if index in index_fields:
+                found = True
+        return found
+
     def reindex(self, obj, attributes=None, update_metadata=None):
-        if self.active:
+        if self.active and self.check_attributes(attributes=attributes):
             if not self.index(obj, attributes):
                 self.unindex(obj)
 

{rer.solrpush-1.4.1 → rer.solrpush-1.4.3}/src/rer/solrpush/utils/solr_search.py

@@ -310,12 +310,13 @@ def search(
         if is_solr_active():
             # log it beacuse it's misconfigured
             logger.error(msg)
-        raise SOLRException(
-            translate(
-                _("solr_configuration_error_label", default=msg),
-                context=api.portal.get().REQUEST,
+            raise SOLRException(
+                translate(
+                    _("solr_configuration_error_label", default=msg),
+                    context=api.portal.get().REQUEST,
+                )
             )
-        )
+        return {"error": True}
     solr_query = generate_query(
         query,
         fl=fl,

{rer.solrpush-1.4.1 → rer.solrpush-1.4.3}/src/rer/solrpush/vocabularies.py

@@ -4,16 +4,28 @@ from zope.interface import implementer
 from zope.schema.interfaces import IVocabularyFactory
 from zope.schema.vocabulary import SimpleTerm
 from zope.schema.vocabulary import SimpleVocabulary
+from rer.solrpush.utils.solr_search import SOLRException
+
+import logging
+
+logger = logging.getLogger(__name__)
 
 
 class FacetsVocabulary(object):
+
+    facet_field = ""
+
     def get_terms(self):
-        solr_results = search(
-            query={"*": "*", "b_size": 1},
-            fl="UID",
-            facets=True,
-            facet_fields=self.facet_field,
-        )
+        try:
+            solr_results = search(
+                query={"*": "*", "b_size": 1},
+                fl="UID",
+                facets=True,
+                facet_fields=self.facet_field,
+            )
+        except SOLRException:
+            logger.exception("")
+            return []
         if isinstance(solr_results, dict) and solr_results.get("error", False):
             return []
         facets = solr_results.facets["facet_fields"].get(self.facet_field, [])

{rer.solrpush-1.4.1 → rer.solrpush-1.4.3}/src/rer.solrpush.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rer.solrpush
-Version: 1.4.1
+Version: 1.4.3
 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.4.3 (2024-10-11)
+------------------
+
+- Fix SolrIndexProcessor logic: avoid not needed reindexes when we are reindexing objects with indexes not in SOLR.
+  [cekk]
+
+
+1.4.2 (2024-08-08)
+------------------
+
+- Do not break vocabularies if solr is deactivated and not configured.
+  [cekk]
+
+
 1.4.1 (2024-07-29)
 ------------------