Skip to content

Commit

Permalink
Additional work on #798.
Browse files Browse the repository at this point in the history
  • Loading branch information
mjordan committed Jul 7, 2024
1 parent d09ea62 commit c893aa7
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions workbench
Original file line number Diff line number Diff line change
Expand Up @@ -3485,6 +3485,22 @@ else:
datefmt="%d-%b-%y %H:%M:%S",
)

ping_islandora(config, print_message=True)
check_integration_module_version(config)

validate_input_dir(config)

# Unzip (and fetch if remote) input data zip archives.
if len(config["input_data_zip_archives"]) > 0:
for input_data_zip_archive in config["input_data_zip_archives"]:
if input_data_zip_archive.lower().startswith("http"):
downloaded_zip_file_path = download_remote_archive_file(
config, input_data_zip_archive
)
unzip_archive(config, downloaded_zip_file_path)
else:
unzip_archive(config, input_data_zip_archive)

if "check" in config.keys():
tasks_to_skip = ["create_from_files", "get_data_from_view"]
if config["check"] is False and config["task"] not in tasks_to_skip:
Expand Down Expand Up @@ -3520,22 +3536,6 @@ if (
):
get_csv_from_excel(config)

validate_input_dir(config)

ping_islandora(config, print_message=True)
check_integration_module_version(config)

# Unzip (and fetch if remote) input data zip archives.
if config["check"] is False and len(config["input_data_zip_archives"]) > 0:
for input_data_zip_archive in config["input_data_zip_archives"]:
if input_data_zip_archive.lower().startswith("http"):
downloaded_zip_file_path = download_remote_archive_file(
config, input_data_zip_archive
)
unzip_archive(config, downloaded_zip_file_path)
else:
unzip_archive(config, input_data_zip_archive)

if config["enable_http_cache"] is True:
if config["http_cache_storage"] == "sqlite" and os.path.exists("http_cache.sqlite"):
logging.info('Cleared HTTP cache file "http_cache.sqlite".')
Expand Down

0 comments on commit c893aa7

Please sign in to comment.