From dba76c8b2471ccf4ffc7f6a8591224009f747d18 Mon Sep 17 00:00:00 2001 From: Tom Kralidis Date: Sun, 22 Dec 2024 12:45:41 -0500 Subject: [PATCH 1/3] fix ref for OARec language object handling --- pycsw/core/metadata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pycsw/core/metadata.py b/pycsw/core/metadata.py index bd9692f0d..ca0184367 100644 --- a/pycsw/core/metadata.py +++ b/pycsw/core/metadata.py @@ -1764,7 +1764,7 @@ def _parse_oarec_record(context, repos, record): _set(context, recobj, 'pycsw:AnyText', ' '.join([str(t) for t in util.get_anytext_from_obj(record)])) - _set(context, recobj, 'pycsw:Language', record['properties'].get('language')) + _set(context, recobj, 'pycsw:Language', record['properties'].get('language', {}).get('code')) _set(context, recobj, 'pycsw:Type', record['properties']['type']) _set(context, recobj, 'pycsw:Title', record['properties']['title']) _set(context, recobj, 'pycsw:Abstract', record['properties'].get('description')) From 895f619c7436996017bd098b440060beefd3f099 Mon Sep 17 00:00:00 2001 From: Tom Kralidis Date: Sun, 22 Dec 2024 12:46:49 -0500 Subject: [PATCH 2/3] add extra logging to repository transactions --- pycsw/core/repository.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pycsw/core/repository.py b/pycsw/core/repository.py index 33813a4a1..1bf9648c5 100644 --- a/pycsw/core/repository.py +++ b/pycsw/core/repository.py @@ -511,6 +511,7 @@ def update(self, record=None, recprops=None, constraint=None): self.dataset, self.context.md_core_model['mappings']['pycsw:XML'])) }, synchronize_session='fetch') self.session.commit() + LOGGER.debug('Updated %d records', rows) return rows except Exception as err: self.session.rollback() @@ -521,6 +522,7 @@ def update(self, record=None, recprops=None, constraint=None): def delete(self, constraint): ''' Delete a record from the repository ''' + LOGGER.debug('Deleting record with constraint: %s', constraint) try: self.session.begin() rows = self._get_repo_filter(self.session.query(self.dataset)).filter( @@ -542,6 +544,7 @@ def delete(self, constraint): synchronize_session='fetch') self.session.commit() + LOGGER.debug('Deleted %d records', rows) except Exception as err: self.session.rollback() msg = 'Cannot commit to repository' From c840cdb0a6dd71a1d0f07459ec7e7d8addab4ff9 Mon Sep 17 00:00:00 2001 From: Tom Kralidis Date: Sun, 22 Dec 2024 12:52:19 -0500 Subject: [PATCH 3/3] fix ref for OARec language object handling --- tests/functionaltests/suites/oarec/conftest.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/functionaltests/suites/oarec/conftest.py b/tests/functionaltests/suites/oarec/conftest.py index e7fe2a203..1df0b7cf6 100644 --- a/tests/functionaltests/suites/oarec/conftest.py +++ b/tests/functionaltests/suites/oarec/conftest.py @@ -233,7 +233,9 @@ def sample_record(): ] } ], - "language": "en", + "language": { + "code": "en" + }, "type": "dataset", "created": "2011-11-11", "updated": "2000-09-01",