eea.coremetadata 3.8__zip → 4.1__zip

{eea.coremetadata-3.8/eea.coremetadata.egg-info → eea.coremetadata-4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eea.coremetadata
-Version: 3.8
+Version: 4.1
 Summary: An add-on for Plone
 Home-page: https://github.com/eea/eea.coremetadata
 Author: European Environment Agency: IDM2 A-Team
@@ -128,6 +128,18 @@ EEA_ - European Environment Agency (EU)
 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()
+  [ichim-david]
+* Fix: Other organisations default value
+  [iugin]
+
 3.8 - (2024-06-19)
 ---------------------------
 * Change: Release

{eea.coremetadata-3.8 → eea.coremetadata-4.1}/docs/HISTORY.txt

@@ -1,6 +1,18 @@
 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()
+  [ichim-david]
+* Fix: Other organisations default value
+  [iugin]
+
 3.8 - (2024-06-19)
 ---------------------------
 * Change: Release

{eea.coremetadata-3.8 → eea.coremetadata-4.1}/eea/coremetadata/behaviors/metadata.py

@@ -69,6 +69,7 @@ class CoreMetadata(MetadataBase):
     @property
     def other_organisations(self):
         """other_organisations getter"""
+
         if not getattr(self.context, "other_organisations", None):
             SITE_STRING = getSite().getId()
             organisations_env = "DEFAULT_ORGANISATIONS_" + SITE_STRING
@@ -82,6 +83,8 @@ class CoreMetadata(MetadataBase):
             if isinstance(DEFAULT_ORGANISATIONS, str):
                 if "," in DEFAULT_ORGANISATIONS:
                     DEFAULT_ORGANISATIONS = DEFAULT_ORGANISATIONS.split(",")
+                elif not DEFAULT_ORGANISATIONS.strip():
+                    DEFAULT_ORGANISATIONS = []
                 else:
                     DEFAULT_ORGANISATIONS = [DEFAULT_ORGANISATIONS]
 

{eea.coremetadata-3.8 → eea.coremetadata-4.1}/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-3.8 → eea.coremetadata-4.1}/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-4.1/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-3.8 → eea.coremetadata-4.1}/eea/coremetadata/metadata.py

@@ -190,6 +190,7 @@ class ICoreMetadata(model.Schema):
         required=False,
         value_type=TextLine(),
         missing_value=(),
+        default=tuple()
     )
 
     if has_ajax_widget:

{eea.coremetadata-3.8 → eea.coremetadata-4.1}/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-3.8 → eea.coremetadata-4.1}/eea/coremetadata/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
-  <version>3.6</version>
+  <version>4.0</version>
   <dependencies>
     <dependency>profile-collective.taxonomy:default</dependency>
   </dependencies>

{eea.coremetadata-3.8 → eea.coremetadata-4.1}/eea/coremetadata/upgrades/configure.zcml

@@ -87,4 +87,13 @@
     profile="eea.coremetadata:default"
     />
 
+  <genericsetup:upgradeStep
+    title="Fix other_organisations default values"
+    description=""
+    source="3.6"
+    destination="4.0"
+    handler=".to_40.to_40"
+    profile="eea.coremetadata:default"
+    />
+
 </configure>

{eea.coremetadata-3.8 → eea.coremetadata-4.1}/eea/coremetadata/upgrades/to_36.py

@@ -49,7 +49,11 @@ def to_36(context):
     brains = api.content.find(portal_type=migrated_types)
 
     for brain in brains:
-        obj = brain.getObject()
+        try:
+            obj = brain.getObject()
+        except KeyError:
+            logging.info("{0} was not found".format(brain.getURL(1)))
+            continue
         obj = aq_self(obj)
         orgs = getattr(obj, 'other_organisations', None)
         logger.info("Check for (%s) - %s",

eea.coremetadata-4.1/eea/coremetadata/upgrades/to_40.py

@@ -0,0 +1,61 @@
+# pylint: disable=W1201, C0301, C0111, W0640, W1202
+# -*- coding: utf-8 -*-
+""" Upgrade to 4.0 """
+import logging
+
+from Products.CMFCore.utils import getToolByName
+from plone.dexterity.utils import iterSchemataForType
+from plone import api
+from Acquisition import aq_self
+from eea.coremetadata.metadata import ICoreMetadata
+
+logger = logging.getLogger("eea.coremetadata.upgrade")
+
+INDEX_NAME = "other_organisations"
+
+
+def to_40(context):
+    catalog = getToolByName(context.aq_parent, "portal_catalog")
+
+    idx_object = catalog.Indexes[INDEX_NAME]
+
+    types = getToolByName(context, 'portal_types').listTypeInfo()
+    migrated_types = []
+
+    for _type in types:
+        portal_type = _type.getId()
+        for schemata in iterSchemataForType(portal_type):
+            if schemata is ICoreMetadata:
+                migrated_types.append(portal_type)
+
+    brains = api.content.find(portal_type=migrated_types)
+
+    for brain in brains:
+        try:
+            obj = brain.getObject()
+        except KeyError:
+            logging.info("{0} was not found".format(brain.getURL(1)))
+            continue
+        obj = aq_self(obj)
+        orgs = getattr(obj, 'other_organisations', None)
+        logger.info("Check for (%s) - %s",
+                    brain.getURL(), obj.other_organisations)
+
+        if orgs is None:
+            obj.other_organisations = tuple()
+            obj._p_changed = True
+            obj.reindexObject()
+            logger.info("Updated other organisations (%s) - empty",
+                        brain.getURL())
+        elif isinstance(orgs, tuple):
+            orgs_clean = tuple([term for term in orgs if len(term.strip())])
+            if orgs_clean and orgs != orgs_clean:
+                obj.other_organisations = orgs_clean
+                obj._p_changed = True
+                obj.reindexObject()
+                logger.info("Updated other organisations (%s) - %s -> %s",
+                            brain.getURL(), orgs, obj.other_organisations)
+
+    catalog.reindexIndex(INDEX_NAME, idx_object)
+
+    logger.info("Upgraded to 4.0")

eea.coremetadata-4.1/eea/coremetadata/version.txt

@@ -0,0 +1 @@
+4.1

{eea.coremetadata-3.8 → eea.coremetadata-4.1/eea.coremetadata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eea.coremetadata
-Version: 3.8
+Version: 4.1
 Summary: An add-on for Plone
 Home-page: https://github.com/eea/eea.coremetadata
 Author: European Environment Agency: IDM2 A-Team
@@ -128,6 +128,18 @@ EEA_ - European Environment Agency (EU)
 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()
+  [ichim-david]
+* Fix: Other organisations default value
+  [iugin]
+
 3.8 - (2024-06-19)
 ---------------------------
 * Change: Release

{eea.coremetadata-3.8 → eea.coremetadata-4.1}/eea.coremetadata.egg-info/SOURCES.txt

@@ -17,6 +17,7 @@ eea.coremetadata.egg-info/top_level.txt
 eea/coremetadata/README.txt
 eea/coremetadata/__init__.py
 eea/coremetadata/configure.zcml
+eea/coremetadata/index_modifiers.py
 eea/coremetadata/indexer.py
 eea/coremetadata/interfaces.py
 eea/coremetadata/metadata.py
@@ -176,4 +177,5 @@ eea/coremetadata/upgrades/__init__.py
 eea/coremetadata/upgrades/configure.zcml
 eea/coremetadata/upgrades/to_20.py
 eea/coremetadata/upgrades/to_24.py
-eea/coremetadata/upgrades/to_36.py
+eea/coremetadata/upgrades/to_36.py
+eea/coremetadata/upgrades/to_40.py

eea.coremetadata-3.8/eea/coremetadata/version.txt

@@ -1 +0,0 @@
-3.8