eea.coremetadata 2.5__zip → 3.0__zip

{eea.coremetadata-2.5/eea.coremetadata.egg-info → eea.coremetadata-3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eea.coremetadata
-Version: 2.5
+Version: 3.0
 Summary: An add-on for Plone
 Home-page: https://github.com/eea/eea.coremetadata
 Author: European Environment Agency: IDM2 A-Team
@@ -129,6 +129,11 @@ EEA_ - European Environment Agency (EU)
 Changelog
 =========
 
+3.0 - (2023-03-23)
+---------------------------
+* Change: Register indexes in portal_catalog and add indexer for temporal _coverage index
+  [razvanMiu]
+
 2.5 - (2022-12-16)
 ---------------------------
 * Change: Distinct title for taxonomies to differentiate in search criteria

{eea.coremetadata-2.5 → eea.coremetadata-3.0}/docs/HISTORY.txt

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+3.0 - (2023-03-23)
+---------------------------
+* Change: Register indexes in portal_catalog and add indexer for temporal _coverage index
+  [razvanMiu]
+
 2.5 - (2022-12-16)
 ---------------------------
 * Change: Distinct title for taxonomies to differentiate in search criteria

eea.coremetadata-3.0/eea/coremetadata/behaviors/configure.zcml

@@ -0,0 +1,54 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:i18n="http://namespaces.zope.org/i18n"
+    xmlns:plone="http://namespaces.plone.org/plone"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
+    i18n_domain="eea">
+
+    <include package="plone.behavior" file="meta.zcml"/>
+
+    <plone:behavior
+        name="eea.coremetadata.behavior"
+        title="EEA Core metadata"
+        description="Adds EEA Core metadata fields"
+        factory="eea.coremetadata.behaviors.metadata.CoreMetadata"
+        provides="eea.coremetadata.metadata.ICoreMetadata"
+        for="plone.dexterity.interfaces.IDexterityContent"
+    />
+
+    <utility
+        name="organisations_vocabulary"
+        component=".vocabulary.organisations_vocabulary"
+    />
+
+    <utility
+        name="index_organisations_vocabulary"
+        component=".vocabulary.index_organisations_vocabulary"
+    />
+
+    <utility
+        name="publisher_vocabulary"
+        component=".vocabulary.publisher_vocabulary"
+    />
+
+    <utility
+        name="index_publisher_vocabulary"
+        component=".vocabulary.index_publisher_vocabulary"
+    />
+
+    <utility
+        name="topics_vocabulary"
+        component=".vocabulary.topics_vocabulary"
+    />
+
+    <utility
+        name="index_topics_vocabulary"
+        component=".vocabulary.index_topics_vocabulary"
+    />
+
+    <utility
+        name="temporal_coverage_vocabulary"
+        component=".vocabulary.temporal_coverage_vocabulary"
+    />
+
+</configure>

eea.coremetadata-3.0/eea/coremetadata/behaviors/vocabulary.py

@@ -0,0 +1,183 @@
+# pylint: disable=W0702
+""" vocabulary.py """
+from collective.taxonomy.interfaces import ITaxonomy
+from zope.interface import provider  # alsoProvides,
+from zope.component import queryUtility
+from zope.schema.interfaces import IVocabularyFactory
+from zope.schema.vocabulary import SimpleTerm, SimpleVocabulary
+from Products.CMFCore.utils import getToolByName
+
+
+@provider(IVocabularyFactory)
+def get_vocabulary(context, vocabulary_name):
+    """get_vocabulary"""
+
+    taxonomy = queryUtility(ITaxonomy, name=vocabulary_name)
+
+    try:
+        vocabulary = taxonomy(context)
+    except:
+        vocabulary = taxonomy.makeVocabulary("en")
+
+    return vocabulary.iterEntries()
+
+
+def get_catalog_values(context, index):
+    """get_catalog_values"""
+
+    catalog = getToolByName(context, "portal_catalog")
+
+    return catalog.uniqueValuesFor(index)
+
+
+@provider(IVocabularyFactory)
+def organisations_vocabulary(context):
+    """organisations_vocabulary"""
+
+    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)
+
+    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)
+
+
+@provider(IVocabularyFactory)
+def publisher_vocabulary(context):
+    """publisher_vocabulary"""
+
+    vocabulary = get_vocabulary(
+        context, "collective.taxonomy.eeapublishertaxonomy"
+    )
+
+    terms = [
+        SimpleTerm(key, key, val.encode("ascii", "ignore").decode("ascii"))
+        for val, key in vocabulary
+    ]
+    terms.sort(key=lambda t: t.title)
+
+    return SimpleVocabulary(terms)
+
+
+@provider(IVocabularyFactory)
+def index_publisher_vocabulary(context):
+    """index_publisher_vocabulary"""
+
+    catalog_values = get_catalog_values(
+        context, "taxonomy_eeapublishertaxonomy"
+    )
+    vocabulary = get_vocabulary(
+        context, "collective.taxonomy.eeapublishertaxonomy"
+    )
+    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)
+
+
+@provider(IVocabularyFactory)
+def topics_vocabulary(context):
+    """topics_vocabulary"""
+
+    utility_name = "collective.taxonomy.eeatopicstaxonomy"
+    taxonomy = queryUtility(ITaxonomy, name=utility_name)
+
+    try:
+        vocabulary = taxonomy(context)
+    except:
+        vocabulary = taxonomy.makeVocabulary("en")
+
+    terms = [
+        SimpleTerm(key, key, val.encode("ascii", "ignore").decode("ascii"))
+        for val, key in vocabulary.iterEntries()
+    ]
+    terms.sort(key=lambda t: t.title)
+
+    return SimpleVocabulary(terms)
+
+
+@provider(IVocabularyFactory)
+def index_topics_vocabulary(context):
+    """index_topics_vocabulary"""
+
+    catalog_values = get_catalog_values(context, "taxonomy_eeatopicstaxonomy")
+    vocabulary = get_vocabulary(
+        context, "collective.taxonomy.eeatopicstaxonomy"
+    )
+    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)
+
+
+@provider(IVocabularyFactory)
+def temporal_coverage_vocabulary(context):
+    """temporal_coverage_vocabulary"""
+
+    catalog = getToolByName(context, "portal_catalog")
+
+    terms = []
+
+    for year in catalog.uniqueValuesFor("temporal_coverage"):
+        terms.append(SimpleTerm(year, year, year))
+
+    terms.sort(key=lambda t: t.title)
+
+    return SimpleVocabulary(terms)
+
+
+# @implementer(IVocabularyFactory)
+# class KeywordsVocabulary(BKV):
+#     """KeywordsVocabulary"""
+#     def __init__(self, index):
+#         self.keyword_index = index
+#
+# TopicsVocabularyFactory = KeywordsVocabulary("topics")

{eea.coremetadata-2.5 → eea.coremetadata-3.0}/eea/coremetadata/configure.zcml

@@ -1,5 +1,8 @@
 <configure
   xmlns="http://namespaces.zope.org/zope"
+  xmlns:zcml="http://namespaces.zope.org/zcml"
+  xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
+  xmlns:five="http://namespaces.zope.org/five"
   xmlns:i18n="http://namespaces.zope.org/i18n"
   i18n_domain="eea">
 
@@ -10,4 +13,6 @@
   <include package=".behaviors" />
   <include package=".upgrades" />
 
+  <adapter factory=".indexer.TemporalCoverageIndexer" name="temporal_coverage" />
+
 </configure>

eea.coremetadata-3.0/eea/coremetadata/indexer.py

@@ -0,0 +1,19 @@
+""" indexer.py """
+from plone.indexer import indexer
+from Products.CMFCore.interfaces import IContentish
+
+
+@indexer(IContentish)
+def TemporalCoverageIndexer(obj):
+    """Temporal coverage indexer"""
+
+    temporal_coverage = getattr(obj, "temporal_coverage", None)
+
+    if not temporal_coverage or "temporal" not in obj.temporal_coverage:
+        return None
+
+    data = {}
+    for val in obj.temporal_coverage["temporal"]:
+        data[val["value"]] = val["label"]
+
+    return data

eea.coremetadata-3.0/eea/coremetadata/profiles/default/catalog.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<object name="portal_catalog">
+
+    <index name="taxonomy_eeaorganisationstaxonomy" meta_type="KeywordIndex">
+        <indexed_attr value="other_organisations"/>
+    </index>
+
+    <index name="taxonomy_eeapublishertaxonomy" meta_type="KeywordIndex">
+        <indexed_attr value="publisher"/>
+    </index>
+
+    <index name="taxonomy_eeatopicstaxonomy" meta_type="KeywordIndex">
+        <indexed_attr value="topics"/>
+    </index>
+
+    <index name="temporal_coverage" meta_type="KeywordIndex">
+        <indexed_attr value="temporal_coverage"/>
+    </index>
+
+    <column value="taxonomy_eeaorganisationstaxonomy" />
+    <column value="taxonomy_eeapublishertaxonomy" />
+    <column value="taxonomy_eeatopicstaxonomy" />
+    <column value="temporal_coverage" />
+
+</object>

{eea.coremetadata-2.5 → eea.coremetadata-3.0}/eea/coremetadata/profiles/default/metadata.xml

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

eea.coremetadata-3.0/eea/coremetadata/profiles/default/registry.xml

@@ -0,0 +1,56 @@
+<registry xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  i18n:domain="plone">
+
+  <records interface="plone.app.querystring.interfaces.IQueryField"
+    prefix="plone.app.querystring.field.taxonomy_eeaorganisationstaxonomy">
+    <value key="title" i18n:translate="">Other organisations involved</value>
+    <value key="description" i18n:translate=""></value>
+    <value key="enabled">True</value>
+    <value key="sortable">True</value>
+    <value key="operations">
+      <element>plone.app.querystring.operation.selection.is</element>
+    </value>
+    <value key="group" i18n:translate="">Taxonomy</value>
+    <value key="vocabulary">index_organisations_vocabulary</value>
+  </records>
+
+  <records interface="plone.app.querystring.interfaces.IQueryField"
+    prefix="plone.app.querystring.field.taxonomy_eeapublishertaxonomy">
+    <value key="title" i18n:translate="">Publisher</value>
+    <value key="description" i18n:translate=""></value>
+    <value key="enabled">True</value>
+    <value key="sortable">True</value>
+    <value key="operations">
+      <element>plone.app.querystring.operation.selection.is</element>
+    </value>
+    <value key="group" i18n:translate="">Taxonomy</value>
+    <value key="vocabulary">index_publisher_vocabulary</value>
+  </records>
+
+  <records interface="plone.app.querystring.interfaces.IQueryField"
+    prefix="plone.app.querystring.field.taxonomy_eeatopicstaxonomy">
+    <value key="title" i18n:translate="">Topics</value>
+    <value key="description" i18n:translate=""></value>
+    <value key="enabled">True</value>
+    <value key="sortable">True</value>
+    <value key="operations">
+      <element>plone.app.querystring.operation.selection.is</element>
+    </value>
+    <value key="group" i18n:translate="">Taxonomy</value>
+    <value key="vocabulary">index_topics_vocabulary</value>
+  </records>
+
+  <records interface="plone.app.querystring.interfaces.IQueryField"
+    prefix="plone.app.querystring.field.temporal_coverage">
+    <value key="title" i18n:translate="">Temporal coverage</value>
+    <value key="description" i18n:translate=""></value>
+    <value key="enabled">True</value>
+    <value key="sortable">True</value>
+    <value key="operations">
+      <element>plone.app.querystring.operation.selection.is</element>
+    </value>
+    <value key="group" i18n:translate="">EEA coremetadata</value>
+    <value key="vocabulary">temporal_coverage_vocabulary</value>
+  </records>
+
+</registry>

{eea.coremetadata-2.5 → eea.coremetadata-3.0}/eea/coremetadata/upgrades/configure.zcml

@@ -45,4 +45,15 @@
     profile="eea.coremetadata:default"
     />
 
+  <genericsetup:upgradeSteps
+    source="2.4"
+    destination="3.0"
+    profile="eea.coremetadata:default"
+  >
+    <genericsetup:upgradeDepends
+      title="Register indexes in portal_catalog and add indexer for temporal_coverage index"
+      import_steps="plone.app.registry catalog"
+    />
+  </genericsetup:upgradeSteps>
+
 </configure>

eea.coremetadata-3.0/eea/coremetadata/version.txt

@@ -0,0 +1 @@
+3.0

{eea.coremetadata-2.5 → eea.coremetadata-3.0/eea.coremetadata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eea.coremetadata
-Version: 2.5
+Version: 3.0
 Summary: An add-on for Plone
 Home-page: https://github.com/eea/eea.coremetadata
 Author: European Environment Agency: IDM2 A-Team
@@ -129,6 +129,11 @@ EEA_ - European Environment Agency (EU)
 Changelog
 =========
 
+3.0 - (2023-03-23)
+---------------------------
+* Change: Register indexes in portal_catalog and add indexer for temporal _coverage index
+  [razvanMiu]
+
 2.5 - (2022-12-16)
 ---------------------------
 * Change: Distinct title for taxonomies to differentiate in search criteria

{eea.coremetadata-2.5 → eea.coremetadata-3.0}/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/indexer.py
 eea/coremetadata/interfaces.py
 eea/coremetadata/metadata.py
 eea/coremetadata/profiles.zcml
@@ -157,7 +158,9 @@ eea/coremetadata/locales/zh_TW/LC_MESSAGES/eea.po
 eea/coremetadata/locales/zh_TW/LC_MESSAGES/plone.mo
 eea/coremetadata/locales/zh_TW/LC_MESSAGES/plone.po
 eea/coremetadata/profiles/default/browserlayer.xml
+eea/coremetadata/profiles/default/catalog.xml
 eea/coremetadata/profiles/default/metadata.xml
+eea/coremetadata/profiles/default/registry.xml
 eea/coremetadata/profiles/default/taxonomies/organisations.cfg
 eea/coremetadata/profiles/default/taxonomies/organisations.xml
 eea/coremetadata/profiles/default/taxonomies/publisher.cfg

eea.coremetadata-2.5/eea/coremetadata/behaviors/configure.zcml

@@ -1,34 +0,0 @@
-<configure
-  xmlns="http://namespaces.zope.org/zope"
-  xmlns:i18n="http://namespaces.zope.org/i18n"
-  xmlns:plone="http://namespaces.plone.org/plone"
-  xmlns:zcml="http://namespaces.zope.org/zcml"
-  i18n_domain="eea">
-
-  <include package="plone.behavior" file="meta.zcml"/>
-
-  <plone:behavior
-    name="eea.coremetadata.behavior"
-    title="EEA Core metadata"
-    description="Adds EEA Core metadata fields"
-    factory="eea.coremetadata.behaviors.metadata.CoreMetadata"
-    provides="eea.coremetadata.metadata.ICoreMetadata"
-    for="plone.dexterity.interfaces.IDexterityContent"
-    />
-
-  <utility
-      name="organisations_vocabulary"
-      component=".vocabulary.organisations_vocabulary"
-      />
-
-  <utility
-      name="publisher_vocabulary"
-      component=".vocabulary.publisher_vocabulary"
-      />
-
-  <utility
-      name="topics_vocabulary"
-      component=".vocabulary.topics_vocabulary"
-      />
-
-</configure>

eea.coremetadata-2.5/eea/coremetadata/behaviors/vocabulary.py

@@ -1,78 +0,0 @@
-# pylint: disable=W0702
-""" vocabulary.py """
-from collective.taxonomy.interfaces import ITaxonomy
-from zope.interface import provider  # alsoProvides,
-from zope.component import queryUtility
-from zope.schema.interfaces import IVocabularyFactory
-from zope.schema.vocabulary import SimpleTerm, SimpleVocabulary
-
-
-@provider(IVocabularyFactory)
-def organisations_vocabulary(context):
-    """organisations_vocabulary"""
-
-    utility_name = "collective.taxonomy.eeaorganisationstaxonomy"
-    taxonomy = queryUtility(ITaxonomy, name=utility_name)
-
-    try:
-        vocabulary = taxonomy(context)
-    except:
-        vocabulary = taxonomy.makeVocabulary('en')
-
-    terms = [
-        SimpleTerm(key, key, val.encode('ascii', 'ignore').decode('ascii'))
-        for val, key in vocabulary.iterEntries()
-    ]
-    terms.sort(key=lambda t: t.title)
-
-    return SimpleVocabulary(terms)
-
-
-@provider(IVocabularyFactory)
-def publisher_vocabulary(context):
-    """publisher_vocabulary"""
-
-    utility_name = "collective.taxonomy.eeapublishertaxonomy"
-    taxonomy = queryUtility(ITaxonomy, name=utility_name)
-
-    try:
-        vocabulary = taxonomy(context)
-    except:
-        vocabulary = taxonomy.makeVocabulary('en')
-
-    terms = [
-        SimpleTerm(key, key, val.encode('ascii', 'ignore').decode('ascii'))
-        for val, key in vocabulary.iterEntries()
-    ]
-    terms.sort(key=lambda t: t.title)
-
-    return SimpleVocabulary(terms)
-
-
-@provider(IVocabularyFactory)
-def topics_vocabulary(context):
-    """topics_vocabulary"""
-
-    utility_name = "collective.taxonomy.eeatopicstaxonomy"
-    taxonomy = queryUtility(ITaxonomy, name=utility_name)
-
-    try:
-        vocabulary = taxonomy(context)
-    except:
-        vocabulary = taxonomy.makeVocabulary('en')
-
-    terms = [
-        SimpleTerm(key, key, val.encode('ascii', 'ignore').decode('ascii'))
-        for val, key in vocabulary.iterEntries()
-    ]
-    terms.sort(key=lambda t: t.title)
-
-    return SimpleVocabulary(terms)
-
-# @implementer(IVocabularyFactory)
-# class KeywordsVocabulary(BKV):
-#     """KeywordsVocabulary"""
-#     def __init__(self, index):
-#         self.keyword_index = index
-#
-# TopicsVocabularyFactory = KeywordsVocabulary("topics")

eea.coremetadata-2.5/eea/coremetadata/version.txt

@@ -1 +0,0 @@
-2.5