WIP

Author: Kolea Plesco

ted_sws/notice_packager/entrypoints/cli/cmd_bulk_packager.py

@@ -25,8 +25,7 @@
     XMLManifestationMetadataExtractor
 from ted_sws.notice_packager import DEFAULT_NOTICE_PACKAGE_EXTENSION
 from ted_sws.notice_packager.services.metadata_transformer import MetadataTransformer
-from ted_sws.notice_packager.services.notice_packager import create_notice_package, package_notice_and_save_to, \
-    ARCHIVE_NAME_FORMAT
+from ted_sws.notice_packager.services.notice_packager import create_notice_package, package_notice_and_save_to
 
 CMD_NAME = "CMD_BULK_PACKAGER"
 DEFAULT_FILES_COUNT: int = 3000
@@ -62,11 +61,10 @@ def run_cmd(self):
         try:
             self.output_path.mkdir(parents=True, exist_ok=True)
             if self.notices:
+                self.log("Saving packages to " + str(self.output_path))
                 for notice in self.notices:
-                    output_file = self.output_path / ARCHIVE_NAME_FORMAT.format(publication_work_identifier())
-                    self.log("Saving package to " + str(output_file))
                     package_notice_and_save_to(notice=notice,
-                                               save_to=output_file)
+                                               save_to=self.output_path)
             else:
                 rdf_files = [Path(str(f_path)) for f in os.listdir(self.rdf_files_path) if
                              os.path.isfile(f_path := os.path.join(self.rdf_files_path, f))]
@@ -116,7 +114,7 @@ def run(rdf_files_count=None, output_folder=None, pkgs_count=None, notice_id=Non
 @click.command()
 @click.argument('rdf-files-folder', nargs=1, required=False)
 @click.argument('pkgs-count', nargs=1, type=click.INT, required=False, default=DEFAULT_FILES_COUNT)
-@click.option('--output-folder', required=False)
+@click.option('--output-folder', required=False, default=".")
 @click.option('--notice-id', required=False, multiple=True, default=None)
 def main(rdf_files_folder, pkgs_count, output_folder, notice_id):
     """

ted_sws/notice_packager/resources/templates/mets2action_mets_xml.jinja2

@@ -6,7 +6,7 @@
       TYPE="{{ notice.action.type }}"
       PROFILE="http://publications.europa.eu/resource/mets/op-sip-profile_002">
     <metsHdr {{ notice.action.type|upper }}DATE="{{ notice.action.date }}">
-        <metsDocumentID>{{ notice.id }}_mets2{{ notice.action.type }}</metsDocumentID>
+        <metsDocumentID>{{ work.identifier }}_{{ notice.action.type }}</metsDocumentID>
     </metsHdr>
     <dmdSec ID="dmdSec01">
         <mdRef MDTYPE="OTHER" LOCTYPE="URL" MIMETYPE="application/rdf+xml" OTHERMDTYPE="INSTANCE" xlink:href="{{ notice.id }}-0.mets.xml.dmd.rdf"/>

ted_sws/notice_packager/services/notice_packager.py

@@ -60,7 +60,6 @@ def create_notice_package(in_data: IN_DATA_TYPE, rdf_content: RDF_CONTENT_TYPE =
     tmp_dir_path = Path(tmp_dir.name)
 
     notice_packager = NoticePackager(in_data, action, tmp_dir_path, notice_repository)
-
     notice_packager.add_template_files()
     notice_packager.add_rdf_content(rdf_content)
     notice_packager.add_extra_files(extra_files)
@@ -79,7 +78,7 @@ def package_notice(notice: Notice) -> Notice:
     return notice
 
 
-def package_notice_and_save_to(notice: Notice, save_to: PATH_TYPE = None, work_identifier: str = None) -> str:
+def package_notice_and_save_to(notice: Notice, save_to: PATH_TYPE = None) -> str:
     """
         This function package a Notice to save_to location.
     """
@@ -160,7 +159,7 @@ def add_template_files(self):
         self.__write_template_to_file(file_tmd_rdf, TemplateGenerator.tmd_rdf_generator, self.template_metadata)
 
         file_mets2action_mets_xml = self.tmp_dir_path / FILE_METS_ACTION_FORMAT.format(
-            notice_id=self.notice_id,
+            work_identifier=self.template_metadata.work.identifier,
             action=self.notice_action
         )
         self.__write_template_to_file(file_mets2action_mets_xml, TemplateGenerator.mets2action_mets_xml_generator,
@@ -189,7 +188,11 @@ def add_extra_files(self, extra_files: PATH_LIST_TYPE):
             self.files += extra_files
 
     def pack(self, save_to: PATH_TYPE) -> str:
-        archive_name = ARCHIVE_NAME_FORMAT.format(notice_id=self.notice_id)
+        archive_name = ARCHIVE_NAME_FORMAT.format(
+            work_identifier=self.template_metadata.work.identifier,
+            action=self.template_metadata.notice.action.type
+        )
+
         archive_path = self.tmp_dir_path / archive_name
         package_path = self.archiver.process_archive(archive_path, self.files)