set pcGtsId to METS file ID everywhere

Author: Robert Sachunsky

ocrd_cis/align/cli.py

@@ -8,6 +8,7 @@
 from ocrd.decorators import ocrd_cli_wrap_processor
 from ocrd_utils import MIMETYPE_PAGE
 from ocrd_utils import getLogger
+from ocrd_utils import make_file_id
 from ocrd_modelfactory import page_from_file
 from ocrd_models.ocrd_page import to_xml
 from ocrd_models.ocrd_page_generateds import TextEquivType
@@ -43,15 +44,14 @@ def process(self):
             pcgts = self.align(alignments, ift)
             # keep the right part after OCR-D-...-filename
             # and prepend output_file_grp
-            # ID = concat_padded(self.output_file_grp, _id+1)
-            basename = os.path.basename(ift[0].input_file.url)
-            ID = self.output_file_grp + '-' + basename.replace('.xml', '')
+            input_file = ift[0].input_file
+            file_id = make_file_id(input_file, self.output_file_grp)
+            pcgts.set_pcGtsId(file_id)
             out = self.workspace.add_file(
-                ID=ID,
+                ID=file_id,
                 file_grp=self.output_file_grp,
-                pageId=ift[0].input_file.pageId,
-                basename=basename,
-                local_filename=os.path.join(self.output_file_grp, basename),
+                pageId=input_file.pageId,
+                local_filename=os.path.join(self.output_file_grp, file_id + '.xml'),
                 mimetype=MIMETYPE_PAGE,
                 content=to_xml(pcgts),
             )

ocrd_cis/ocropy/binarize.py

@@ -169,6 +169,7 @@ def process(self):
 
             # update METS (add the PAGE file):
             file_path = os.path.join(self.output_file_grp, file_id + '.xml')
+            pcgts.set_pcGtsId(file_id)
             out = self.workspace.add_file(
                 ID=file_id,
                 file_grp=self.output_file_grp,

ocrd_cis/ocropy/clip.py

@@ -212,6 +212,7 @@ def process(self):
 
             # update METS (add the PAGE file):
             file_path = os.path.join(self.output_file_grp, file_id + '.xml')
+            pcgts.set_pcGtsId(file_id)
             out = self.workspace.add_file(
                 ID=file_id,
                 file_grp=self.output_file_grp,

ocrd_cis/ocropy/denoise.py

@@ -121,6 +121,7 @@ def process(self):
 
             # update METS (add the PAGE file):
             file_path = os.path.join(self.output_file_grp, file_id + '.xml')
+            pcgts.set_pcGtsId(file_id)
             out = self.workspace.add_file(
                 ID=file_id,
                 file_grp=self.output_file_grp,

ocrd_cis/ocropy/deskew.py

@@ -112,6 +112,7 @@ def process(self):
 
             # update METS (add the PAGE file):
             file_path = os.path.join(self.output_file_grp, file_id + '.xml')
+            pcgts.set_pcGtsId(file_id)
             out = self.workspace.add_file(
                 ID=file_id,
                 file_grp=self.output_file_grp,

ocrd_cis/ocropy/dewarp.py

@@ -180,6 +180,7 @@ def process(self):
 
             # update METS (add the PAGE file):
             file_path = os.path.join(self.output_file_grp, file_id + '.xml')
+            pcgts.set_pcGtsId(file_id)
             out = self.workspace.add_file(
                 ID=file_id,
                 file_grp=self.output_file_grp,

ocrd_cis/ocropy/recognize.py

@@ -179,6 +179,7 @@ def process(self):
             # update METS (add the PAGE file):
             file_id = make_file_id(input_file.ID, self.output_file_grp)
             file_path = os.path.join(self.output_file_grp, file_id + '.xml')
+            pcgts.set_pcGtsId(file_id)
             out = self.workspace.add_file(
                 ID=file_id,
                 file_grp=self.output_file_grp,

ocrd_cis/ocropy/resegment.py

@@ -276,6 +276,7 @@ def process(self):
 
             # update METS (add the PAGE file):
             file_path = os.path.join(self.output_file_grp, file_id + '.xml')
+            pcgts.set_pcGtsId(file_id)
             out = self.workspace.add_file(
                 ID=file_id,
                 file_grp=self.output_file_grp,

ocrd_cis/ocropy/segment.py

@@ -382,6 +382,7 @@ def process(self):
 
             # update METS (add the PAGE file):
             file_path = os.path.join(self.output_file_grp, file_id + '.xml')
+            pcgts.set_pcGtsId(file_id)
             out = self.workspace.add_file(
                 ID=file_id,
                 file_grp=self.output_file_grp,