From 7d71e16b58f1e91b85e5e0aa9545989816602aca Mon Sep 17 00:00:00 2001 From: Thorge Petersen <petersen@rz.uni-kiel.de> Date: Wed, 21 Feb 2024 15:43:55 +0100 Subject: [PATCH] Improved code readability of _copy_spatial_uri_temp_to_extras function --- ckanext/odsh/validation.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ckanext/odsh/validation.py b/ckanext/odsh/validation.py index c8502529..f5735507 100644 --- a/ckanext/odsh/validation.py +++ b/ckanext/odsh/validation.py @@ -257,15 +257,14 @@ def known_spatial_uri(key, data, errors, context): def _copy_spatial_uri_temp_to_extras(data): ''' - copy the field spatial_uri_temp or + Copy the field spatial_uri_temp or spatial_url_temp originating from the user interface to extras ''' - spatial_uri = data.get(('__extras',)).get('spatial_uri_temp') - if spatial_uri is None: - spatial_uri = data.get(('__extras',)).get('spatial_url_temp') - is_spatial_uri_in_extras = _extract_value(data, 'spatial_uri') is not None - if not is_spatial_uri_in_extras: + extras_data = data.get(('__extras',)) + spatial_uri = extras_data.get('spatial_uri_temp') or extras_data.get('spatial_url_temp') + + if _extract_value(data, 'spatial_uri') is None: next_index = next_extra_index(data) data[('extras', next_index, 'key')] = 'spatial_uri' data[('extras', next_index, 'value')] = spatial_uri -- GitLab