sets support

invenio_oaiserver/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2015-2018 CERN.
+# Copyright (C) 2015-2022 CERN.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
@@ -182,8 +182,6 @@
 (GPLv3 licensed).
 """
 
-from __future__ import absolute_import, print_function
-
 from .ext import InvenioOAIServer
 from .proxies import current_oaiserver
 from .version import __version__

invenio_oaiserver/config.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Invenio.
 # Copyright (C) 2015-2018 CERN.
-# Copyright (C) 2021 Graz University of Technology.
+# Copyright (C) 2022 Graz University of Technology.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
@@ -124,9 +124,11 @@
 OAISERVER_CREATED_KEY = "_created"
 """Record created key."""
 
-OAISERVER_RECORD_SETS_FETCHER = 'invenio_oaiserver.utils:record_sets_fetcher'
+OAISERVER_RECORD_SETS_FETCHER = 'invenio_oaiserver.percolator:find_sets_for_record'
 """Record's OAI sets function."""
 
+OAISERVER_SET_RECORDS_QUERY_FETCHER = 'invenio_oaiserver.fetchers:set_records_query_fetcher'
+
 OAISERVER_RECORD_CLS = 'invenio_records.api:Record'
 """Record retrieval class."""
 

invenio_oaiserver/errors.py

@@ -1,15 +1,14 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2016-2018 CERN.
+# Copyright (C) 2016-2022 CERN.
+# Copyright (C) 2022 Graz University of Technology.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
 
 """Error."""
 
-from __future__ import absolute_import, print_function
-
 
 class OAIBadMetadataFormatError(Exception):
     """Metadata format required doesn't exist."""
@@ -20,3 +19,11 @@ class OAISetSpecUpdateError(Exception):
 
     The correct way is to delete the set and create a new one.
     """
+
+
+class OAINoRecordsMatchError(Exception):
+    """No records match the query.
+
+    The combination of the values of the from, until, and set arguments
+    results in an empty list.
+    """

invenio_oaiserver/ext.py

@@ -1,18 +1,15 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2015-2018 CERN.
-# Copyright (C) 2021 Graz University of Technology.
+# Copyright (C) 2015-2022 CERN.
+# Copyright (C) 2021-2022 Graz University of Technology.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
 
 """Invenio-OAIServer extension implementation."""
 
-from __future__ import absolute_import, print_function
-
 from invenio_base.utils import obj_or_import_string
-from invenio_records import signals as records_signals
 from sqlalchemy.event import contains, listen, remove
 
 from . import config
@@ -56,6 +53,11 @@ def record_fetcher(self):
         """Get the record fetcher class for record serialization."""
         return obj_or_import_string(self.app.config['OAISERVER_GETRECORD_FETCHER'])
 
+    @property
+    def set_records_query_fetcher(self):
+        """Get query to retrieve records based on set."""
+        return obj_or_import_string(self.app.config['OAISERVER_SET_RECORDS_QUERY_FETCHER'])
+
     @property
     def last_update_key(self):
         """Get record update key."""
@@ -82,14 +84,6 @@ def sets(self, values):
 
     def register_signals(self):
         """Register signals."""
-        from .receivers import OAIServerUpdater
-
-        # Register Record signals to update OAI informations
-        self.update_function = OAIServerUpdater()
-        records_signals.before_record_insert.connect(self.update_function,
-                                                     weak=False)
-        records_signals.before_record_update.connect(self.update_function,
-                                                     weak=False)
         if self.app.config['OAISERVER_REGISTER_SET_SIGNALS']:
             self.register_signals_oaiset()
 
@@ -105,11 +99,6 @@ def register_signals_oaiset(self):
     def unregister_signals(self):
         """Unregister signals."""
         # Unregister Record signals
-        if hasattr(self, 'update_function'):
-            records_signals.before_record_insert.disconnect(
-                self.update_function)
-            records_signals.before_record_update.disconnect(
-                self.update_function)
         self.unregister_signals_oaiset()
 
     def unregister_signals_oaiset(self):
@@ -168,7 +157,7 @@ def init_config(self, app):
             import warnings
 
             app.config['OAISERVER_ID_PREFIX'] = \
-                'oai:{0}:recid/'.format(socket.gethostname())
+                'oai:{0}:'.format(socket.gethostname())
             warnings.warn(
                 """Please specify the OAISERVER_ID_PREFIX configuration."""
                 """default value is: {0}""".format(

invenio_oaiserver/fetchers.py

@@ -1,20 +1,21 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2016-2018 CERN.
+# Copyright (C) 2016-2022 CERN.
 # Copyright (C) 2021 Graz University of Technology.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
 
 """Persistent identifier fetchers."""
 
-from __future__ import absolute_import, print_function
-
+from elasticsearch_dsl.query import Q
 from invenio_pidstore.errors import PersistentIdentifierError
 from invenio_pidstore.fetchers import FetchedPID
 
+from .models import OAISet
 from .provider import OAIIDProvider
+from .query import query_string_parser
 
 
 def oaiid_fetcher(record_uuid, data):
@@ -33,3 +34,15 @@ def oaiid_fetcher(record_uuid, data):
         pid_type=OAIIDProvider.pid_type,
         pid_value=str(pid_value),
     )
+
+
+def set_records_query_fetcher(setSpec):
+    """Fetch query to retrieve records based on provided set spec."""
+    set = OAISet.query.filter(OAISet.spec == setSpec).first()
+    if set is None:
+        # raise error that no matches can be found ?
+        query = Q('match_none')
+    else:
+        query = Q(query_string_parser(set.search_pattern))
+
+    return query

invenio_oaiserver/minters.py

@@ -1,22 +1,17 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2016-2018 CERN.
+# Copyright (C) 2016-2022 CERN.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
 
 """Persistent identifier minters."""
 
-from __future__ import absolute_import, print_function
-
-from datetime import datetime
-
 from flask import current_app
 from invenio_pidstore import current_pidstore
 
 from .provider import OAIIDProvider
-from .utils import datetime_to_datestamp
 
 
 def oaiid_minter(record_uuid, data):

invenio_oaiserver/models.py

@@ -1,24 +1,20 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2015-2018 CERN.
+# Copyright (C) 2015-2022 CERN.
+# Copyright (C) 2022 Graz University of Technology.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
 
 """Models for storing information about OAIServer state."""
 
-from datetime import datetime
-
 from flask_babelex import lazy_gettext as _
 from invenio_db import db
-from sqlalchemy.event import listen
 from sqlalchemy.orm import validates
 from sqlalchemy_utils import Timestamp
 
 from .errors import OAISetSpecUpdateError
-from .proxies import current_oaiserver
-from .utils import datetime_to_datestamp
 
 
 class OAISet(db.Model, Timestamp):
@@ -76,52 +72,5 @@ def validate_spec(self, key, value):
             raise OAISetSpecUpdateError("Updating spec is not allowed.")
         return value
 
-    def add_record(self, record):
-        """Add a record to the OAISet.
-
-        :param record: Record to be added.
-        :type record: `invenio_records.api.Record` or derivative.
-        """
-        record.setdefault('_oai', {}).setdefault('sets', [])
-
-        assert not self.has_record(record)
-
-        record['_oai']['sets'].append(self.spec)
-
-    def remove_record(self, record):
-        """Remove a record from the OAISet.
-
-        :param record: Record to be removed.
-        :type record: `invenio_records.api.Record` or derivative.
-        """
-        assert self.has_record(record)
-
-        record['_oai']['sets'] = [
-            s for s in record['_oai']['sets'] if s != self.spec]
-
-    def has_record(self, record):
-        """Check if the record blongs to the OAISet.
-
-        :param record: Record to be checked.
-        :type record: `invenio_records.api.Record` or derivative.
-        """
-        return self.spec in record.get('_oai', {}).get('sets', [])
-
-
-def oaiset_removed_or_inserted(mapper, connection, target):
-    """Invalidate cache on collection insert or delete."""
-    current_oaiserver.sets = None
-
-
-def oaiset_attribute_changed(target, value, oldvalue, initiator):
-    """Invalidate cache if dbquery change."""
-    if value != oldvalue:
-        current_oaiserver.sets = None
-
-
-# update cache with list of collections
-listen(OAISet, 'after_insert', oaiset_removed_or_inserted)
-listen(OAISet, 'after_delete', oaiset_removed_or_inserted)
-listen(OAISet.search_pattern, 'set', oaiset_attribute_changed)
 
 __all__ = ('OAISet', )