Thanks to visit codestin.com
Credit goes to github.com

Skip to content

mets:fileGrp/@USE must be xsd:ID #758

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

Merged
kba merged 2 commits into from
Dec 8, 2021
Merged

mets:fileGrp/@USE must be xsd:ID #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93b4d14
Update spec to 3.15.0
kba Dec 7, 2021
f291b38
OcrdMets.add_file: Enforce mets:fileGrp/@USE to be valid xsd:int, #746
kba Dec 7, 2021
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ Versioned according to [Semantic Versioning](http://semver.org/).

## Unreleased

Changed:

* `OcrdMets.add_file`: `mets:fileGrp/@USE` must be valid `xs:ID`, #746

## [2.28.0] - 2021-11-30

Added:
Expand Down
4 changes: 3 additions & 1 deletion ocrd_models/ocrd_models/ocrd_mets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,9 @@ def add_file(self, fileGrp, mimetype=None, url=None, ID=None, pageId=None, force
if not fileGrp:
raise ValueError("Must set fileGrp of the mets:file")
if not REGEX_FILE_ID.fullmatch(ID):
raise ValueError("Invalid syntax for mets:file/@ID %s" % ID)
raise ValueError("Invalid syntax for mets:file/@ID %s (not an xs:ID)" % ID)
if not REGEX_FILE_ID.fullmatch(fileGrp):
raise ValueError("Invalid syntax for mets:fileGrp/@USE %s (not an xs:ID)" % ID)
el_fileGrp = self._tree.getroot().find(".//mets:fileGrp[@USE='%s']" % (fileGrp), NS)
if el_fileGrp is None:
el_fileGrp = self.add_file_group(fileGrp)
Expand Down
2 changes: 1 addition & 1 deletion repo/spec
Open in desktop
Submodule spec updated 4 files
+9 −3 CHANGELOG.md
+4 −0 README.md
+0 −364 glossary.de.md
+1 −1 mets.md
6 changes: 6 additions & 0 deletions tests/model/test_ocrd_mets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,5 +255,11 @@ def test_merge(self):
self.mets.merge(other_mets, fileGrp_mapping={'OCR-D-IMG': 'FOO'})
assert len(self.mets.file_groups) == 18

def test_invalid_filegrp(self):
"""https://github.com/OCR-D/core/issues/746"""
mets = OcrdMets(content="<mets></mets>")
with self.assertRaisesRegex(ValueError, "Invalid syntax for mets:fileGrp/@USE"):
mets.add_file('1:! bad filegrp', ID="foo123", pageId="foobar")

if __name__ == '__main__':
main(__file__)
6 changes: 3 additions & 3 deletions tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,9 +289,9 @@ def test_make_file_id_570(self):
def test_make_file_id_605(self):
"""https://github.com/OCR-D/core/pull/605"""
mets = OcrdMets.empty_mets()
f = mets.add_file('1:!GRP', ID='FOO_0001', pageId='phys0001')
f = mets.add_file('2:!GRP', ID='FOO_0002', pageId='phys0002')
self.assertEqual(make_file_id(f, '2:!GRP'), 'id_2_GRP_0002')
f = mets.add_file('GRP1', ID='FOO_0001', pageId='phys0001')
f = mets.add_file('GRP2', ID='FOO_0002', pageId='phys0002')
self.assertEqual(make_file_id(f, 'GRP2'), 'GRP2_0002')

def test_generate_range(self):
assert generate_range('PHYS_0001', 'PHYS_0005') == ['PHYS_0001', 'PHYS_0002', 'PHYS_0003', 'PHYS_0004', 'PHYS_0005']
Expand Down