rer.solrpush 1.3.2__tar.gz → 1.3.4__tar.gz

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

@@ -2,13 +2,24 @@ Changelog
 =========
 
 
+1.3.4 (2024-12-05)
+------------------
+
+- Handle also boolean indexes.
+  [cekk]
+
+1.3.3 (2023-11-08)
+------------------
+
+- Fix RSS Feed.
+  [cekk]
+
 1.3.2 (2023-11-08)
 ------------------
 
 - Update translation for content_remove_error.
   [cekk]
 
-
 1.3.1 (2023-08-01)
 ------------------
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rer.solrpush
-Version: 1.3.2
+Version: 1.3.4
 Summary: Prodotto per Regione Emilia-Romagna relativo all'indicizzazione dei contenuti con solr
 Home-page: https://github.com/collective/rer.solrpush
 Author: RedTurtle
@@ -241,13 +241,24 @@ Changelog
 =========
 
 
+1.3.4 (2024-12-05)
+------------------
+
+- Handle also boolean indexes.
+  [cekk]
+
+1.3.3 (2023-11-08)
+------------------
+
+- Fix RSS Feed.
+  [cekk]
+
 1.3.2 (2023-11-08)
 ------------------
 
 - Update translation for content_remove_error.
   [cekk]
 
-
 1.3.1 (2023-08-01)
 ------------------
 

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

@@ -16,7 +16,7 @@ long_description = "\n\n".join(
 
 setup(
     name="rer.solrpush",
-    version="1.3.2",
+    version="1.3.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.3.2 → rer.solrpush-1.3.4}/src/rer/solrpush/adapters/configure.zcml

@@ -8,4 +8,6 @@
       factory=".file.FileExtractor"
       />
 
+  <!-- RSS feed -->
+  <adapter factory=".rss_feed.SOLRFeedItem"/>
 </configure>

rer.solrpush-1.3.4/src/rer/solrpush/adapters/rss_feed.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+from Products.CMFPlone.browser.syndication.adapters import BaseItem
+from Products.CMFPlone.interfaces.syndication import IFeed
+from Products.CMFPlone.interfaces.syndication import IFeedItem
+from rer.solrpush.interfaces.adapter import ISolrBrain
+from zope.component import adapter
+from zope.interface import implementer
+
+
+@implementer(IFeedItem)
+@adapter(ISolrBrain, IFeed)
+class SOLRFeedItem(BaseItem):
+
+    @property
+    def link(self):
+        return self.context.getURL()
+
+    @property
+    def title(self):
+        return self.context.Title
+
+    @property
+    def description(self):
+        return self.context.Description
+
+    @property
+    def rights(self):
+        return ""

{rer.solrpush-1.3.2 → rer.solrpush-1.3.4}/src/rer/solrpush/parser.py

@@ -69,6 +69,10 @@ class Brain(dict):
     def Description(self):
         return self.get("description", "")
 
+    def absolute_url(self):
+        """convenience alias"""
+        return self.getUrl()
+
     @property
     def Date(self):
         if self.EffectiveDate().startswith("1969"):
@@ -134,6 +138,9 @@ class Brain(dict):
             return None
         return DateTime(value).toZone(timezone)
 
+    def Subject(self):
+        return self.get("Subject", [])
+
     def MimeTypeIcon(self):
         mime_type = self.get("mime_type", None)
         if not mime_type:

{rer.solrpush-1.3.2 → rer.solrpush-1.3.4}/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.2 → rer.solrpush-1.3.4}/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.2 → rer.solrpush-1.3.4}/src/rer.solrpush.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rer.solrpush
-Version: 1.3.2
+Version: 1.3.4
 Summary: Prodotto per Regione Emilia-Romagna relativo all'indicizzazione dei contenuti con solr
 Home-page: https://github.com/collective/rer.solrpush
 Author: RedTurtle
@@ -241,13 +241,24 @@ Changelog
 =========
 
 
+1.3.4 (2024-12-05)
+------------------
+
+- Handle also boolean indexes.
+  [cekk]
+
+1.3.3 (2023-11-08)
+------------------
+
+- Fix RSS Feed.
+  [cekk]
+
 1.3.2 (2023-11-08)
 ------------------
 
 - Update translation for content_remove_error.
   [cekk]
 
-
 1.3.1 (2023-08-01)
 ------------------
 

{rer.solrpush-1.3.2 → rer.solrpush-1.3.4}/src/rer.solrpush.egg-info/SOURCES.txt

@@ -35,6 +35,7 @@ src/rer/solrpush/vocabularies.py
 src/rer/solrpush/adapters/__init__.py
 src/rer/solrpush/adapters/configure.zcml
 src/rer/solrpush/adapters/file.py
+src/rer/solrpush/adapters/rss_feed.py
 src/rer/solrpush/behaviors/__init__.py
 src/rer/solrpush/behaviors/configure.zcml
 src/rer/solrpush/behaviors/solr_fields.py