Skip to content

Re-add how the pid is created at a level higher than 1 - this was rem… #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bdgregg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Re-add how the pid is created at a level higher than 1 - this was rem… #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion scan-batch-dir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,13 @@ def process_tiff(file_path:str, level):
# Create the JP2 derivative if it does not already exist.
# if the JP2 does not exist:
jp2_path = f"{dir}/{pid}.jp2"
out_pid = f"{pid}"

# Only prefix with the parent when one actually exists — top-level
# (level == 1) files have no meaningful parent, matching process_file().
if level == 1 or not parent:
out_pid = f"{pid}"
else:
out_pid = f"{parent}-{pid}"

logger.info(f"Tiff: Creating JP2: {jp2_path}")
if not os.path.exists(jp2_path):
Expand Down Expand Up @@ -958,6 +964,8 @@ def process_file(df: pd.DataFrame, file_path: str, level):
pid = f"{file_name}"
if level == 1:
parent_folder = ''
elif parent_folder:
pid = f"{parent_folder}-{file_name}"

# Default row_data
row_data = {
Expand Down