From 4b64d4e86cbf29f532d3ccdcdd85a1de059d2e32 Mon Sep 17 00:00:00 2001 From: Brett Date: Wed, 29 Jan 2025 15:48:31 +0100 Subject: [PATCH] updates to action.py and utils.py --- ckanext/xloader/action.py | 2 +- ckanext/xloader/utils.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ckanext/xloader/action.py b/ckanext/xloader/action.py index f159d2f3..22529559 100644 --- a/ckanext/xloader/action.py +++ b/ckanext/xloader/action.py @@ -146,7 +146,7 @@ def xloader_submit(context, data_dict): "metadata": { "ignore_hash": data_dict.get("ignore_hash", False), "ckan_url": config.get("ckanext.xloader.site_url") - or config["ckan.site_url"], + or config["ckan.site_url"], "resource_id": res_id, "set_url_type": data_dict.get("set_url_type", False), "task_created": task["last_updated"], diff --git a/ckanext/xloader/utils.py b/ckanext/xloader/utils.py index f9eb34a1..e7978682 100644 --- a/ckanext/xloader/utils.py +++ b/ckanext/xloader/utils.py @@ -125,9 +125,8 @@ def modify_ckan_url(result_url: str, ckan_url: str) -> str: """ parsed_url = urlparse(result_url) base_url = f"{parsed_url.scheme}://{parsed_url.netloc}" - path_url = parsed_url.path - if base_url != ckan_url: + path_url = parsed_url.path result_url = urljoin(ckan_url, path_url) return result_url