From 7cb6a84d682a5c691ab3d40eba5c31df3c61512c Mon Sep 17 00:00:00 2001 From: Jesse Vickery Date: Tue, 16 Jul 2024 14:15:00 +0000 Subject: [PATCH] fix(logic): ckan versioning; - DS fields for ckan versions. --- ckanext/xloader/loader.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ckanext/xloader/loader.py b/ckanext/xloader/loader.py index da0edb1d..1da79fee 100644 --- a/ckanext/xloader/loader.py +++ b/ckanext/xloader/loader.py @@ -178,11 +178,11 @@ def load_csv(csv_filepath, resource_id, mimetype='text/csv', logger=None): existing = datastore_resource_exists(resource_id) existing_info = {} if existing: - if p.toolkit.check_ckan_version(max_version='2.9'): - existing_fields = existing.get('fields', []) - else: + if p.toolkit.check_ckan_version(min_version='2.10'): ds_info = p.toolkit.get_action('datastore_info')({'ignore_auth': True}, {'id': resource_id}) existing_fields = ds_info.get('fields', []) + else: + existing_fields = existing.get('fields', []) existing_info = dict((f['id'], f['info']) for f in existing_fields if 'info' in f)