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

Skip to content

OcrdMets.get_physical_pages_for: edge case empty list for_fileIds #1193

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

Jump to bottom
Merged
kba merged 9 commits into from
Mar 5, 2024
Merged

OcrdMets.get_physical_pages_for: edge case empty list for_fileIds #1193

kba merged 9 commits into from
Mar 5, 2024

Conversation

@bertsky
Copy link
Collaborator

@bertsky bertsky commented Feb 23, 2024 •
edited
Loading

Fixes #1192
Fixes #1195

@bertsky bertsky requested a review from kba February 23, 2024 22:22
@bertsky bertsky mentioned this pull request Mar 1, 2024
Closed
@bertsky bertsky linked an issue Mar 1, 2024 that may be closed by this pull request
Invalid structMap produced #1195
Closed
kba
kba approved these changes Mar 5, 2024
View reviewed changes
Copy link
Member

@kba kba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will release right away.

src/ocrd_models/ocrd_mets.py

def merge(self, other_mets, force=False, fileGrp_mapping=None, fileId_mapping=None, pageId_mapping=None,
after_add_cb=None, **kwargs):
def merge(self, other_mets, force : bool = False,
Copy link
Member

@kba kba Mar 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
def merge(self, other_mets, force : bool = False,
def merge(self, other_mets : 'OcrdMets', force : bool = False,

You can reference classes not yet defined by quoting them.

src/ocrd_models/ocrd_mets.py
# Create a new entry in the fptr cache and
# assign an empty dictionary to hold the fileids
self._fptr_cache[pageId] = {}
self._fptr_cache.setdefault(pageId, {})
Copy link
Member

@kba kba Mar 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

eek, thx for spotting

@kba kba merged commit 2cb1e27 into master Mar 5, 2024
@bertsky
Copy link
Collaborator Author

bertsky commented Mar 7, 2024 •
edited
Loading

Ouch! I still see the problem after installing this (cannot reproduce my own fix anymore)... Problem is really in ocrd_all – somehow, editable and non-editable installation of core got mixed...

@bertsky
Copy link
Collaborator Author

bertsky commented Mar 7, 2024

Problem is really in ocrd_all – somehow, editable and non-editable installation of core got mixed...

Reason is simply that ocrd/core installs via normal site-packages, whereas ocrd/all on top of that installs core editable (under /build/core) – so in these images we have both versions next to each other.

@bertsky
Copy link
Collaborator Author

bertsky commented Mar 7, 2024

Reason is simply that ocrd/core installs via normal site-packages, whereas ocrd/all on top of that installs core editable (under /build/core) – so in these images we have both versions next to each other.

OCR-D/ocrd_all#416

@bertsky bertsky mentioned this pull request Mar 7, 2024
Merged
@bertsky bertsky deleted the fix-get-physical-pages branch June 6, 2024 14:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kba kba kba approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Invalid structMap produced OcrdMets.get_physical_pages regression: assertion on non-empty result

3 participants

@bertsky @kba