Merge pull request #37 from eea/develop

Fix: Latest eea.coremetadata release has issues - refs #273093

docs/HISTORY.txt

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+4.1 - (2024-07-25)
+---------------------------
+* Change: Fix: Latest eea.coremetadata release has issues - refs #273093
+  [avoinea]
+
 4.0 - (2024-06-21)
 ---------------------------
 * Change: fix(upgrade-script): add try except for KeyError brain.getObjects()

eea/coremetadata/behaviors/vocabulary.py

@@ -30,46 +30,66 @@ def get_catalog_values(context, index):
     return catalog.uniqueValuesFor(index)
 
 
+def eea_other_organisations(context):
+    """other_organisations index data"""
+    catalog = getToolByName(context, "portal_catalog")
+    idx_object = catalog.Indexes['other_organisations']
+    terms = [SimpleTerm(item[0], item[0], item[0])
+             for item in idx_object.items()]
+    return SimpleVocabulary(terms)
+
+
 @provider(IVocabularyFactory)
 def organisations_vocabulary(context):
     """organisations_vocabulary"""
 
-    vocabulary = get_vocabulary(
-        context, "collective.taxonomy.eeaorganisationstaxonomy"
-    )
+    # import pdb
+    # pdb.set_trace()
+    return eea_other_organisations(context)
+    # vocabulary = get_vocabulary(
+    #     context, "collective.taxonomy.eeaorganisationstaxonomy"
+    # )
 
-    terms = [
-        SimpleTerm(key, key, val.encode("ascii", "ignore").decode("ascii"))
-        for val, key in vocabulary
-    ]
-    terms.sort(key=lambda t: t.title)
+    # terms = [
+    #     SimpleTerm(key, key, val.encode("ascii", "ignore").decode("ascii"))
+    #     for val, key in vocabulary
+    # ]
+    # # import pdb
+    # # pdb.set_trace()
+    # terms.sort(key=lambda t: t.title)
 
-    return SimpleVocabulary(terms)
+    # return SimpleVocabulary(terms)
 
 
 @provider(IVocabularyFactory)
 def index_organisations_vocabulary(context):
     """index_organisations_vocabulary"""
 
-    catalog_values = get_catalog_values(
-        context, "taxonomy_eeaorganisationstaxonomy"
-    )
-    vocabulary = get_vocabulary(
-        context, "collective.taxonomy.eeaorganisationstaxonomy"
-    )
-    terms = []
-
-    for val, key in vocabulary:
-        if key in catalog_values:
-            terms.append(
-                SimpleTerm(
-                    key, key, val.encode("ascii", "ignore").decode("ascii")
-                )
-            )
-
-    terms.sort(key=lambda t: t.title)
-
-    return SimpleVocabulary(terms)
+    # import pdb
+    # pdb.set_trace()
+    return eea_other_organisations(context)
+
+    # catalog_values = get_catalog_values(
+    #     context, "taxonomy_eeaorganisationstaxonomy"
+    # )
+    # vocabulary = get_vocabulary(
+    #     context, "collective.taxonomy.eeaorganisationstaxonomy"
+    # )
+    # terms = []
+
+    # # import pdb
+    # # pdb.set_trace()
+    # for val, key in vocabulary:
+    #     if key in catalog_values:
+    #         terms.append(
+    #             SimpleTerm(
+    #                 key, key, val.encode("ascii", "ignore").decode("ascii")
+    #             )
+    #         )
+
+    # terms.sort(key=lambda t: t.title)
+
+    # return SimpleVocabulary(terms)
 
 
 @provider(IVocabularyFactory)

eea/coremetadata/configure.zcml

@@ -20,4 +20,9 @@
       name="eea.coremetadata.other_organisations"
       component=".vocabulary.OtherOrganisationsVocabularyFactory"
       />
+  <utility
+      factory=".index_modifiers.OtherOrganisations"
+      provides="plone.app.querystring.interfaces.IParsedQueryIndexModifier"
+      name="taxonomy_eeaorganisationstaxonomy"
+      />
 </configure>

eea/coremetadata/index_modifiers.py

@@ -0,0 +1,15 @@
+"""Modify indexer."""
+
+from plone.app.querystring.interfaces import IParsedQueryIndexModifier
+from zope.interface import implementer
+
+
+@implementer(IParsedQueryIndexModifier)
+class OtherOrganisations(object):
+    """ Get other_organisation index instead taxonomy_eeaorganisationstaxonomy
+    """
+
+    def __call__(self, value):
+        """
+        """
+        return ("other_organisations", value)

eea/coremetadata/profiles/default/catalog.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <object name="portal_catalog">
 
-    <index name="taxonomy_eeaorganisationstaxonomy" meta_type="KeywordIndex">
+    <index name="other_organisations" meta_type="KeywordIndex">
         <indexed_attr value="other_organisations"/>
     </index>
 

eea/coremetadata/version.txt

@@ -1 +1 @@
-4.0
+4.1