rer.solrpush 1.3.3__tar.gz → 1.3.5__tar.gz

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

@@ -2,6 +2,19 @@ Changelog
 =========
 
 
+1.3.5 (2024-12-05)
+------------------
+
+- Reload schema from solr with upgrade-step.
+  [cekk]
+
+
+1.3.4 (2024-12-05)
+------------------
+
+- Handle also boolean indexes.
+  [cekk]
+
 1.3.3 (2023-11-08)
 ------------------
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rer.solrpush
-Version: 1.3.3
+Version: 1.3.5
 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,19 @@ Changelog
 =========
 
 
+1.3.5 (2024-12-05)
+------------------
+
+- Reload schema from solr with upgrade-step.
+  [cekk]
+
+
+1.3.4 (2024-12-05)
+------------------
+
+- Handle also boolean indexes.
+  [cekk]
+
 1.3.3 (2023-11-08)
 ------------------
 

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

@@ -16,7 +16,7 @@ long_description = "\n\n".join(
 
 setup(
     name="rer.solrpush",
-    version="1.3.3",
+    version="1.3.5",
     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.3 → rer.solrpush-1.3.5}/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.3 → rer.solrpush-1.3.5}/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.3 → rer.solrpush-1.3.5}/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.3 → rer.solrpush-1.3.5}/src/rer/solrpush/utils/solr_indexer.py

@@ -129,7 +129,7 @@ def create_index_dict(item):
         if six.PY2:
             field = field.encode("ascii")
         value = getattr(adapter, field, None)
-        if not value:
+        if not value and value is not False:
             continue
         if callable(value):
             value = value()
@@ -238,20 +238,21 @@ def push_to_solr(item_or_obj):
     if not solr:
         logger.error("Unable to push to solr. Configuration is incomplete.")
         return
-    if not isinstance(item_or_obj, dict):
-        if can_index(item_or_obj):
-            item_or_obj = create_index_dict(item_or_obj)
-        else:
-            item_or_obj = None
-    if not item_or_obj:
+    context = item_or_obj
+    if isinstance(item_or_obj, dict):
+        obj = api.content.get(UID=item_or_obj.get("UID", ""))
+        if obj:
+            context = obj
+    if not can_index(context):
         return False
-    attachment = item_or_obj.pop("attachment", None)
+    index_dict = create_index_dict(context)
+    attachment = index_dict.pop("attachment", None)
     if attachment:
         add_with_attachment(
-            solr=solr, attachment=attachment, fields=item_or_obj
+            solr=solr, attachment=attachment, fields=index_dict
         )
     else:
-        solr.add(docs=[item_or_obj], commit=should_force_commit())
+        solr.add(docs=[index_dict], commit=should_force_commit())
     return True
 
 

{rer.solrpush-1.3.3 → rer.solrpush-1.3.5}/src/rer/solrpush/utils/solr_search.py

@@ -228,7 +228,7 @@ def extract_from_query(query):
     index_fields = get_index_fields()
     params = {"q": "", "fq": []}
     for index, value in query.items():
-        if not value:
+        if not value and value is not False:
             continue
         if index == "*":
             params["q"] = "*:*"
@@ -242,7 +242,7 @@ def extract_from_query(query):
             continue
         # other indexes will be added in fq
         value = fix_value(value=value, index_type=index_infos.get("type", ""))
-        if value:
+        if value or value is False:
             if index == "path":
                 index = "path_parents"
             params["fq"].append(

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rer.solrpush
-Version: 1.3.3
+Version: 1.3.5
 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,19 @@ Changelog
 =========
 
 
+1.3.5 (2024-12-05)
+------------------
+
+- Reload schema from solr with upgrade-step.
+  [cekk]
+
+
+1.3.4 (2024-12-05)
+------------------
+
+- Handle also boolean indexes.
+  [cekk]
+
 1.3.3 (2023-11-08)
 ------------------