Merge pull request #68 from markusweigelt/adjustments-for-mets-server…

…-option

Adjustments for mets server option

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+
+## [0.1.4] - 2023-12-12
+### Changed
+- mm-update: adapt to OCR-D API changes
+
 ## [0.1.3] - 2023-02-11
 ### Added
 - mm2tei CLI param controlling page and line refs via @corresp
@@ -66,7 +71,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Get rid of code artifacts carried over from `tocrify`
 
 <!-- link-labels -->
-[unreleased]: ../../compare/v0.1.3...master
+[unreleased]: ../../compare/v0.1.4...master
+[0.1.4]: ../../compare/v0.1.3...v0.1.4
 [0.1.3]: ../../compare/v0.1.2...v0.1.3
 [0.1.2]: ../../compare/v0.1.1...v0.1.2
 [0.1.1]: ../../compare/v0.1.0...v0.1.1

mets_mods2tei/scripts/update.py

@@ -26,10 +26,10 @@
 
 class WorkspaceCtx():
 
-    def __init__(self, directory, mets_url, automatic_backup):
+    def __init__(self, *args, **kwargs):
         self.log = getLogger('mets_mods2tei.update')
         self.resolver = Resolver()
-        self.directory, self.mets_url, self.mets_basename = self.resolver.resolve_mets_arguments(directory, mets_url, None)
+        self.directory, self.mets_url, self.mets_basename, _ = self.resolver.resolve_mets_arguments(directory, mets_url, None, None)
         self.automatic_backup = automatic_backup
 
 pass_workspace = click.make_pass_decorator(WorkspaceCtx)
@@ -121,8 +121,10 @@ def remove_file_cli(ctx, url_prefix, path):
     if url_prefix:
         if not url_prefix.endswith('/'):
             url_prefix += '/'
-        path = url_prefix + path
-    files = list(workspace.find_files(url=path))
+        kwargs = dict(url=url_prefix + path)
+    else:
+        kwargs = dict(local_filename=path)
+    files = list(workspace.find_files(**kwargs))
     ctx.log.info("removing references for %d files", len(files))
     for file_ in files:
         workspace.remove_file(file_.ID, keep_file=True)
@@ -148,8 +150,10 @@ def add_file_cli(ctx, file_grp, mimetype, page_id, url_prefix, path):
     if url_prefix:
         if not url_prefix.endswith('/'):
             url_prefix += '/'
-        path = url_prefix + path
-    workspace.add_file(file_grp, file_id=file_id, mimetype=mimetype, page_id=page_id, url=path, loctype='URL' if url_prefix else 'OTHER')
+        kwargs = dict(url=url_prefix + path, loctype='URL')
+    else:
+        kwargs = dict(local_filename = path, loctype='OTHER')
+    workspace.add_file(file_grp, file_id=file_id, mimetype=mimetype, page_id=page_id, **kwargs)
     workspace.save_mets()
 
 @cli.command('add-agent')

requirements.txt

@@ -4,5 +4,5 @@ babel
 generateDS
 python-Levenshtein
 more-itertools
-ocrd
+ocrd >= 2.59
 ocrd_utils