rer.solrpush 1.4.0__tar.gz → 1.4.2__tar.gz

{rer.solrpush-1.4.0 → rer.solrpush-1.4.2}/CHANGES.rst

@@ -2,6 +2,19 @@ Changelog
 =========
 
 
+1.4.2 (2024-08-08)
+------------------
+
+- Do not break vocabularies if solr is deactivated and not configured.
+  [cekk]
+
+
+1.4.1 (2024-07-29)
+------------------
+
+- Raise custom exception when there is an error.
+  [cekk]
+
 1.4.0 (2024-05-05)
 ------------------
 

{rer.solrpush-1.4.0 → rer.solrpush-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rer.solrpush
-Version: 1.4.0
+Version: 1.4.2
 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,19 @@ Changelog
 =========
 
 
+1.4.2 (2024-08-08)
+------------------
+
+- Do not break vocabularies if solr is deactivated and not configured.
+  [cekk]
+
+
+1.4.1 (2024-07-29)
+------------------
+
+- Raise custom exception when there is an error.
+  [cekk]
+
 1.4.0 (2024-05-05)
 ------------------
 

{rer.solrpush-1.4.0 → rer.solrpush-1.4.2}/setup.py

@@ -16,7 +16,7 @@ long_description = "\n\n".join(
 
 setup(
     name="rer.solrpush",
-    version="1.4.0",
+    version="1.4.2",
     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.0 → rer.solrpush-1.4.2}/src/rer/solrpush/browser/maintenance.py

@@ -318,7 +318,7 @@ class ReindexBaseView(BrowserView):
         tot = len(brains_to_sync)
         for brain in brains_to_sync:
             i += 1
-            if i % 10 == 0:
+            if i % 100 == 0:
                 logger.info(f"Progress: {i}/{tot}")
             if not disable_progress:
                 status["counter"] = status["counter"] + 1
@@ -327,9 +327,7 @@ class ReindexBaseView(BrowserView):
             if brain.UID not in solr_items:
                 # missing from solr: try to index it
                 try:
-                    logger.info("send to solr")
                     res = push_to_solr(item)
-                    logger.info("received response from solr")
                     if res:
                         indexed.append(brain.getPath())
                 except SolrError as e:

{rer.solrpush-1.4.0 → rer.solrpush-1.4.2}/src/rer/solrpush/restapi/services/solr_search/solr_search_handler.py

@@ -6,7 +6,6 @@ from Products.CMFCore.utils import getToolByName
 from rer.solrpush.restapi.services.solr_search.batch import SolrHypermediaBatch
 from rer.solrpush.utils import search as solr_search
 
-
 DEFAULT_METADATA_FIELDS = set(
     ["@id", "@type", "description", "review_state", "title"]
 )

{rer.solrpush-1.4.0 → rer.solrpush-1.4.2}/src/rer/solrpush/utils/solr_search.py

@@ -26,6 +26,12 @@ logger = logging.getLogger(__name__)
 TRIM = re.compile(r"\s+")
 ESCAPE_CHARS_RE = re.compile(r'(?<!\\)(?P<char>[&|+\-!(){}[\]^"~*?:])')
 
+
+class SOLRException(Exception):
+    "Raised when the solr respoonse return an error"
+    pass
+
+
 # HELPER METHODS
 
 
@@ -304,13 +310,13 @@ def search(
         if is_solr_active():
             # log it beacuse it's misconfigured
             logger.error(msg)
-        return {
-            "error": True,
-            "message": 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,
@@ -323,9 +329,8 @@ def search(
         return res
     except Exception as e:
         logger.exception(e)
-        return {
-            "error": True,
-            "message": translate(
+        raise SOLRException(
+            translate(
                 _(
                     "search_error_label",
                     default="Unable to perform a search with SOLR."
@@ -333,8 +338,8 @@ def search(
                     " minutes.",
                 ),
                 context=api.portal.get().REQUEST,
-            ),
-        }
+            )
+        )
 
 
 def _set_query_debug(solr, params):

{rer.solrpush-1.4.0 → rer.solrpush-1.4.2}/src/rer/solrpush/vocabularies.py

@@ -7,6 +7,9 @@ from zope.schema.vocabulary import SimpleVocabulary
 
 
 class FacetsVocabulary(object):
+
+    facet_field = ""
+
     def get_terms(self):
         solr_results = search(
             query={"*": "*", "b_size": 1},

{rer.solrpush-1.4.0 → rer.solrpush-1.4.2}/src/rer.solrpush.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rer.solrpush
-Version: 1.4.0
+Version: 1.4.2
 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,19 @@ Changelog
 =========
 
 
+1.4.2 (2024-08-08)
+------------------
+
+- Do not break vocabularies if solr is deactivated and not configured.
+  [cekk]
+
+
+1.4.1 (2024-07-29)
+------------------
+
+- Raise custom exception when there is an error.
+  [cekk]
+
 1.4.0 (2024-05-05)
 ------------------