Merge pull request 'Release v24.07' (!342) from release_24.07 into ma…

…ster

pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.goobi.workflow</groupId>
         <artifactId>workflow-base</artifactId>
-        <version>24.06</version>
+        <version>24.07</version>
         <relativePath/>
     </parent>
     <artifactId>workflow-core</artifactId>
@@ -15,6 +15,13 @@
             <url>https://nexus.intranda.com/repository/maven-public</url>
         </repository>
     </repositories>
+    <dependencies>
+        <dependency>
+            <groupId>io.goobi.vocabulary</groupId>
+            <artifactId>vocabulary-server-exchange</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+    </dependencies>
     <build>
         <plugins>
             <plugin>
@@ -79,8 +86,7 @@
                         </goals>
                         <configuration>
                             <sourceFile>${project.build.directory}/classes/template.properties</sourceFile>
-                            <destinationFile>${project.build.directory}/classes/goobi_config.properties
-                            </destinationFile>
+                            <destinationFile>${project.build.directory}/classes/goobi_config.properties</destinationFile>
                         </configuration>
                     </execution>
                 </executions>
@@ -100,4 +106,3 @@
         </resources>
     </build>
 </project>
-

src/main/java/de/sub/goobi/config/ConfigurationHelper.java

@@ -1111,6 +1111,10 @@ public int getNumberOfMetaBackups() {
         return getLocalInt("numberOfMetaBackups", 9);
     }
 
+    public int getNumberOfBackups() {
+        return getLocalInt("numberOfBackups", 9);
+    }
+
     /*
      * subcategory in goobi_config.properties/METS EDITOR: user interface
      */
@@ -1291,6 +1295,14 @@ public boolean isPdfAsDownload() {
         return getLocalBoolean("pdfAsDownload", true);
     }
 
+    public String getVocabularyServerHost() {
+        return getLocalString("vocabularyServerHost", "localhost");
+    }
+
+    public int getVocabularyServerPort() {
+        return getLocalInt("vocabularyServerPort", 8081);
+    }
+
     /**
      * This setter is only used by unit tests and makes manipulation of the configuration possible.
      *

src/main/java/de/sub/goobi/export/download/ExportMets.java

@@ -123,6 +123,7 @@
 import ugh.dl.ExportFileformat;
 import ugh.dl.Fileformat;
 import ugh.dl.Md;
+import ugh.dl.Md.MdType;
 import ugh.dl.MetadataType;
 import ugh.dl.Prefs;
 import ugh.dl.VirtualFileGroup;
@@ -407,8 +408,7 @@ private ExportFileformat collectMetadataToSave(Process myProzess, Fileformat gdz
                 }
                 Element techMd = createTechMd(path);
                 if (techMd != null) {
-                    Md md = new Md(techMd);
-                    md.setType("techMD");
+                    Md md = new Md(techMd, MdType.TECH_MD);
                     md.setId(String.format("AMD_%04d", counter++));
                     dd.addTechMd(md);
                     page.setAdmId(md.getId());

src/main/java/de/sub/goobi/forms/AdditionalField.java

@@ -99,7 +99,8 @@ public void setInitEnd(String newValue) {
     }
 
     public void setWert(String newValue) {
-        if (newValue == null || newValue.equals(this.initStart)) {
+        // TODO: Testing for "null" is not nice, but JSF seems to store empty selection of dropdowns as "null" instead of null
+        if (newValue == null || "null".equals(newValue) || newValue.equals(this.initStart)) {
             newValue = "";
         }
         if (newValue.startsWith(this.initStart)) {
@@ -204,6 +205,10 @@ public LocalDate getValueAsDate() {
     }
 
     public void setValueAsDate(LocalDate date) {
+        if (date == null) {
+            return;
+        }
+
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         wert = formatter.format(date);
     }