Merge pull request #4451 from henning-gerhardt/fix_missing_metshdr_cr…

…eatedate Set current date and time if no creation date is provided
kitodo · Jun 4, 2021 · 1fbd58a · 1fbd58a
2 parents e72455b + af2179a
commit 1fbd58a
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 1 deletion.
diff --git a/Kitodo-DataFormat/src/main/java/org/kitodo/dataformat/access/MetsXmlElementAccess.java b/Kitodo-DataFormat/src/main/java/org/kitodo/dataformat/access/MetsXmlElementAccess.java
@@ -107,7 +107,13 @@ private MetsXmlElementAccess(Mets mets) {
         this();
         MetsHdr metsHdr = mets.getMetsHdr();
         if (Objects.nonNull(metsHdr)) {
-            workpiece.setCreationDate(metsHdr.getCREATEDATE().toGregorianCalendar());
+            GregorianCalendar gregorianCalendar;
+            if (Objects.nonNull(metsHdr.getCREATEDATE())) {
+                gregorianCalendar = metsHdr.getCREATEDATE().toGregorianCalendar();
+            } else {
+                gregorianCalendar = new GregorianCalendar();
+            }
+            workpiece.setCreationDate(gregorianCalendar);
             for (Agent agent : metsHdr.getAgent()) {
                 workpiece.getEditHistory().add(new AgentXmlElementAccess(agent).getProcessingNote());
             }

diff --git a/Kitodo-DataFormat/src/test/java/org/kitodo/dataformat/access/MetsXmlElementAccessIT.java b/Kitodo-DataFormat/src/test/java/org/kitodo/dataformat/access/MetsXmlElementAccessIT.java
@@ -12,10 +12,12 @@
 package org.kitodo.dataformat.access;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URI;
 import java.nio.file.Files;
@@ -246,4 +248,11 @@ public void testSave() throws Exception {
 
         clean();
     }
+
+    @Test
+    public void missingMetsHeaderCreationDateDidNotThrowNullPointerException() throws IOException {
+        Workpiece workpiece = new MetsXmlElementAccess()
+                .read(new FileInputStream(new File("src/test/resources/meta_missing_createdate.xml")));
+        assertNotNull(workpiece.getCreationDate());
+    }
 }
diff --git a/Kitodo-DataFormat/src/test/resources/meta_missing_createdate.xml b/Kitodo-DataFormat/src/test/resources/meta_missing_createdate.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  * (c) Kitodo. Key to digital objects e. V. <[email protected]>
+  *
+  * This file is part of the Kitodo project.
+  *
+  * It is licensed under GNU General Public License version 3 or later.
+  *
+  * For the full copyright and license information, please read the
+  * GPL3-License.txt file that was distributed with this source code.
+  -->
+<mets:mets xsi:schemaLocation="info:lc/xmlns/premis-v2 http://www.loc.gov/standards/premis/v2/premis-v2-0.xsd http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/mods.xsd http://www.loc.gov/METS/ http://www.loc.gov/standards/mets/mets.xsd http://www.loc.gov/mix/v10 http://www.loc.gov/standards/mix/mix10/mix10.xsd" xmlns:mets="http://www.loc.gov/METS/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <mets:metsHdr>
+    <mets:agent OTHERTYPE="SOFTWARE" ROLE="CREATOR" TYPE="OTHER">
+      <mets:name>Kitodo - kitodo-ugh-2.1.0-kitodo-ugh-2.1.0 - 22−May−2017</mets:name>
+      <mets:note>Kitodo</mets:note>
+    </mets:agent>
+  </mets:metsHdr>
+  <mets:dmdSec ID="DMDLOG_0000">
+    <mets:mdWrap MDTYPE="OTHER" OTHERMDTYPE="Kitodo">
+      <mets:xmlData>
+        <kitodo:kitodo xmlns:kitodo="http://meta.kitodo.org/v1/">
+          <kitodo:metadata name="singleDigCollection">Collection 2</kitodo:metadata>
+          <kitodo:metadata name="PublicationYearSorting">1910</kitodo:metadata>
+          <kitodo:metadata name="PlaceOfPublication">Berlin</kitodo:metadata>
+          <kitodo:metadata name="SizeSourcePrint">VI, 134 S.</kitodo:metadata>
+          <kitodo:metadata name="TitleDocMain">Das Pharmazeutische Institut der Universität Berlin</kitodo:metadata>
+          <kitodo:metadata name="TitleDocMainShort">Pharmazeutische Institut der Universität Berlin</kitodo:metadata>
+          <kitodo:metadata name="CatalogIDDigital">644901748</kitodo:metadata>
+          <kitodo:metadata name="shelfmarksource">Online Ressource</kitodo:metadata>
+          <kitodo:metadata name="DocLanguage">ger</kitodo:metadata>
+          <kitodo:metadata name="TSL_ATS">ThomDas</kitodo:metadata>
+          <kitodo:metadata name="PublisherName">Bornträger</kitodo:metadata>
+        </kitodo:kitodo>
+      </mets:xmlData>
+    </mets:mdWrap>
+  </mets:dmdSec>
+  <mets:dmdSec ID="DMDPHYS_0000">
+    <mets:mdWrap MDTYPE="OTHER" OTHERMDTYPE="Kitodo">
+      <mets:xmlData>
+        <kitodo:kitodo xmlns:kitodo="http://meta.kitodo.org/v1/">
+          <kitodo:metadata name="copyrightimageset">Copyright: Universitätsbibliothek Braunschweig</kitodo:metadata>
+          <kitodo:metadata name="shelfmarksource">2726-0409</kitodo:metadata>
+          <kitodo:metadata name="pathimagefiles">file:///mnt/data/metadata/6/images/ThomPhar_644901748_tif</kitodo:metadata>
+        </kitodo:kitodo>
+      </mets:xmlData>
+    </mets:mdWrap>
+  </mets:dmdSec>
+  <mets:fileSec>
+    <mets:fileGrp USE="LOCAL">
+      <mets:file ID="FILE_0001" MIMETYPE="image/tiff">
+        <mets:FLocat LOCTYPE="URL" xlink:href="images/ThomPhar_644901748_media/00000001.tif" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+      </mets:file>
+    </mets:fileGrp>
+  </mets:fileSec>
+  <mets:structMap TYPE="LOGICAL">
+    <mets:div DMDID="DMDLOG_0000" ID="LOG_0000" TYPE="Monograph" />
+  </mets:structMap>
+  <mets:structMap TYPE="PHYSICAL">
+    <mets:div DMDID="DMDPHYS_0000" ID="PHYS_0000" TYPE="physSequence">
+      <mets:div ID="PHYS_0001" ORDER="1" ORDERLABEL="uncounted" TYPE="page">
+        <mets:fptr FILEID="FILE_0001"/>
+      </mets:div>
+    </mets:div>
+  </mets:structMap>
+  <mets:structLink>
+    <mets:smLink xlink:to="PHYS_0001" xlink:from="LOG_0000" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+  </mets:structLink>
+</mets:mets>