Ensure structmap isn't included and METS create V2 fails under various error conditions #1455
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
ross-spencer
changed the title
ross-spencer
force-pushed
the
dev/issue-283-make-custom-structmap-more-robust
branch
3 times, most recently
from
0cbc66a
to
cbef58f
Compare
ross-spencer
changed the title
ross-spencer
changed the title
replaceafill
approved these changes
Jul 31, 2019
| normalized_path = _fixup_path_input_by_user(job, file_path) | ||
| if normalized_path in state.fileNameToFileID: | ||
| item.set("FILEID", state.fileNameToFileID[normalized_path]) | ||
| else: | ||
| state.error_accumulator.error_count += 1 |
There was a problem hiding this comment.
Is there a reason to move this line up here?
There was a problem hiding this comment.
Just it looked nicer ^_^;
| self.validate_mets(self.mets_xsd_path, broken_structmap_path) | ||
| except etree.DocumentInvalid: | ||
| assert ( | ||
| True |
There was a problem hiding this comment.
Nothing to do about this, but I'm never sure how to best represent these cases: assert True. A comment may have the same effect.
There was a problem hiding this comment.
That's a fair point. I might try a comment style the next time around; though I hope we move away more from test case and use the pytest style you showed me with the checksum validation microservice.
| continue | ||
| else: | ||
| self.validate_mets(self.mets_xsd_path, structmap_path) | ||
| self.validate_mets(self.mets_xsd_path, structmap_path) |
There was a problem hiding this comment.
Nice cleanup of these broken functionality.
| normalized_path = _fixup_path_input_by_user(job, file_path) | ||
| if normalized_path in state.fileNameToFileID: | ||
| item.set("FILEID", state.fileNameToFileID[normalized_path]) | ||
| else: | ||
| state.error_accumulator.error_count += 1 | ||
| job.pyprint( | ||
| "Custom structmap error: no fileUUID for", | ||
| file_path, | ||
| normalized_path, | ||
| file=sys.stderr, | ||
| ) |
There was a problem hiding this comment.
Oh! One thing I just noticed is that part doesn't use the logger like the other errors:
Custom structmap error: no fileUUID for objects/_ferdinand_short_2017_01_27.mp3 objects/_ferdinand_short_2017_01_27.mp3
vs
createmets_v2.0: ERROR 2019-07-31 14:42:04,990 archivematica.mcp.client.createMETS2.include_custom_structmap:925 Mismatch of CONTENTID elements to elements we wish to replace. AIP METS cannot be generated
There was a problem hiding this comment.
Hi @replaceafill I've changed it to a logger here: 47af926 can you let me know that's okay, and then I'll merge asap and we can get into regression testing!!
ross-spencer
force-pushed
the
dev/issue-283-make-custom-structmap-more-robust
branch
3 times, most recently
from
47af926
to
175646e
Compare
A number of different error conditions were spotted during testing of the Archivematica 1.10 release candidate. Rather than failing silently in the system we introduce logic to make the output more robust. Example failure conditions for custom structMaps include when files do not exist, or there are empty attributes for the CONTENTID field.
ross-spencer
force-pushed
the
dev/issue-283-make-custom-structmap-more-robust
branch
from
175646e
to
e9896ba
Compare
replaceafill
added
the
Status: in progress
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.
A number of different error conditions were spotted during testing of
the Archivematica 1.10 release candidate. Rather than failing
silently in the system we introduce logic to make the output more
robust. Example failure conditions for custom structMaps include when
files do not exist, or there are empty attributes for the CONTENTID
field.
Additionally, small sections of the code have been made simpler.
Tests have been added, and all sample structmaps created for this feature will still pass. Those are available from here.
Connected to archivematica/Issues#283