Keep local copies of files in a separate mets:FLocat #1079
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # ocrd_models/ocrd_models/ocrd_file.py
Contributor
|
When the files are downloaded there is an output with relative file path per line. When I did undo the downloading it returned just |
Member
Author
Good point, I hadn't thought about that. Should be fixed in 0f26809 For the kant_aufklaerung_1784 test asset: and the reverse: |
Contributor
|
Yes, that output is more convenient. Great! |
kba
added a commit
to OCR-D/ocrd_olena
that referenced
this pull request
Sep 12, 2023
This was referenced Oct 12, 2023
This was referenced Nov 20, 2023
bertsky
reviewed
Jan 19, 2024
This was referenced Jan 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
One early decision that has haunted us for years now is that we have been using a single
mets:FLocatfor both the original URL of amets:fileand the local copy in the workspace we use for processing.This PR tries to solve #323 by changing
OcrdFileand the download logic inResolverandWorkspace:mets:FLocat[@LOCTYPE="URL"]/xlink:hrefOcrdFile.local_filename) will now be written to an additionalmets:Flocat[@LOCTYPE="OTHER"][@OTHERLOCTYPE="FILE"]/xlink:hrefWorkspace.download_fileis that after calling it withOcrdFile f,fwill have alocal_filenameattribute and that is what processors should use rather than theurl.Resolver.download_to_directoryandWorkspace.download_filehas been adapted accordingly.The goal here is to make the OCR-D processing non-invasive. Currently, once you do
ocrd workspace find --download, the original URL will be gone. With this PR,ocrd workspace find --downloadwill add an additionalmets:Flocatwhich can then be removed after processing is finished (to be compliant with the DFG Viewer METS profile) withocrd workspace find --undo-download.