Handle old Archivematica METS documents #53
Merged
Conversation
This file contains 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
sevein
force-pushed
the
dev/issue-24-handle-old-aips
branch
6 times, most recently
from
dfc5dca
to
eec8691
Compare
sevein
force-pushed
the
dev/issue-24-handle-old-aips
branch
from
eec8691
to
1f4b7fd
Compare
|
@cole, can you take a look? I've added 1954131, this came up when I was updating artefactual/archivematica-storage-service#438 so it uses metsrw. I've tweaked the FSEntry constructor a bit so it doesn't error. Also, I'm going to need 22e17ff since the transfer METS is still using old-style fptrs. 22e17ff is going to be relevant in the future because AM needs to be able to work with old-style fptrs when importing vintage AIPs. |
sevein
force-pushed
the
dev/issue-24-handle-old-aips
branch
from
1954131
to
cefa538
Compare
|
Uh this is not as easy as I thought... |
cole
approved these changes
Mar 8, 2019
sevein
force-pushed
the
dev/issue-24-handle-old-aips
branch
2 times, most recently
from
4968085
to
158351b
Compare
This commit updates `_parse_tree_structmap` so `FSEntry` objects are
created also when the parser runs into direct `fptr` elements, e.g.:
<div TYPE="directory" LABEL="objects">
<fptr FILEID="001.csv-0c0576c3-e82e-4501-9aef-1f3d2d35aeda"/>
<fptr FILEID="002.mpg-722de890-2a3c-4343-bb69-f2b29894d9a7"/>
<fptr FILEID="003.mpg-423247e7-c27d-4b5a-a64a-b02833f2212d"/>
</div>
sevein
force-pushed
the
dev/issue-24-handle-old-aips
branch
from
158351b
to
985047f
Compare
In Py2, ``FSEntry.path`` uses binary. This commit updates the constructor so it uses the `utf-8` encoder when we're encoding text type. The default encoder is `ascii` which is problematic. In Py3, ``FSEntry.path`` is using Unicode and that needs to be fixed.
sevein
force-pushed
the
dev/issue-24-handle-old-aips
branch
from
985047f
to
f7ff13f
Compare
cole
approved these changes
Mar 8, 2019
sevein
force-pushed
the
dev/issue-24-handle-old-aips
branch
from
ae2950e
to
a4f0edc
Compare
This avoids the following issue:
> return ' '.join([str(x) for x in texts])
^^^^^^
E UnicodeEncodeError: 'ascii' codec can't encode characters in
position 42-44: ordinal not in range(128)
Only fixed in Py2. Py3 codepath will need more work overall.
sevein
force-pushed
the
dev/issue-24-handle-old-aips
branch
from
a4f0edc
to
f06008d
Compare
|
Tests are passing but coverage decreased. I'll merge. |
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.
This pull request brings fixes for some issues found while trying to read METS documents generated by old versions of Archivematica.
Connects to archivematica/Issues#24.