export: override mime type with original data, ignore types in fileGrp

Author: rsehr

Goobi/pom.xml

@@ -1227,7 +1227,7 @@
 		<dependency>
 			<groupId>de.intranda.ugh</groupId>
 			<artifactId>ugh-core</artifactId>
-			<version>3.0.12-SNAPSHOT</version>
+			<version>3.0.12</version>
 			<exclusions>
 				<exclusion>
 					<groupId>poi</groupId>

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

@@ -3,7 +3,7 @@
 /**
  * This file is part of the Goobi Application - a Workflow tool for the support of mass digitization.
  * 
- * Visit the websites for more information. 
+ * Visit the websites for more information.
  *     		- https://goobi.io
  * 			- https://www.intranda.com
  * 			- https://github.com/intranda/goobi
@@ -88,8 +88,8 @@ public class ExportMets {
      * @throws TypeNotAllowedForParentException
      */
     public boolean startExport(Process myProzess) throws IOException, InterruptedException, DocStructHasNoTypeException, PreferencesException,
-            WriteException, MetadataTypeNotAllowedException, ExportFileException, UghHelperException, ReadException, SwapException, DAOException,
-            TypeNotAllowedForParentException {
+    WriteException, MetadataTypeNotAllowedException, ExportFileException, UghHelperException, ReadException, SwapException, DAOException,
+    TypeNotAllowedForParentException {
         LoginBean login = (LoginBean) Helper.getManagedBeanValue("#{LoginForm}");
         String benutzerHome = "";
         if (login != null) {
@@ -119,8 +119,8 @@ public boolean startExport(Process myProzess) throws IOException, InterruptedExc
      * @throws TypeNotAllowedForParentException
      */
     public boolean startExport(Process myProzess, String inZielVerzeichnis) throws IOException, InterruptedException, PreferencesException,
-            WriteException, DocStructHasNoTypeException, MetadataTypeNotAllowedException, ExportFileException, UghHelperException, ReadException,
-            SwapException, DAOException, TypeNotAllowedForParentException {
+    WriteException, DocStructHasNoTypeException, MetadataTypeNotAllowedException, ExportFileException, UghHelperException, ReadException,
+    SwapException, DAOException, TypeNotAllowedForParentException {
 
         /*
          * -------------------------------- Read Document --------------------------------
@@ -250,28 +250,20 @@ protected boolean writeMetsFile(Process myProzess, String targetFileName, Filefo
 
         if (myFilegroups != null && myFilegroups.size() > 0) {
             for (ProjectFileGroup pfg : myFilegroups) {
+
                 // check if source files exists
                 if (pfg.getFolder() != null && pfg.getFolder().length() > 0) {
                     String foldername = myProzess.getMethodFromName(pfg.getFolder());
                     if (foldername != null) {
                         Path folder = Paths.get(myProzess.getMethodFromName(pfg.getFolder()));
                         if (folder != null && StorageProvider.getInstance().isFileExists(folder)
                                 && !StorageProvider.getInstance().list(folder.toString()).isEmpty()) {
-                            VirtualFileGroup v = new VirtualFileGroup();
-                            v.setName(pfg.getName());
-                            v.setPathToFiles(vp.replace(pfg.getPath()));
-                            v.setMimetype(pfg.getMimetype());
-                            v.setFileSuffix(pfg.getSuffix());
+                            VirtualFileGroup v = createFilegroup(vp, pfg);
                             mm.getDigitalDocument().getFileSet().addVirtualFileGroup(v);
                         }
                     }
                 } else {
-
-                    VirtualFileGroup v = new VirtualFileGroup();
-                    v.setName(pfg.getName());
-                    v.setPathToFiles(vp.replace(pfg.getPath()));
-                    v.setMimetype(pfg.getMimetype());
-                    v.setFileSuffix(pfg.getSuffix());
+                    VirtualFileGroup v = createFilegroup(vp, pfg);
                     mm.getDigitalDocument().getFileSet().addVirtualFileGroup(v);
                 }
             }
@@ -306,10 +298,9 @@ protected boolean writeMetsFile(Process myProzess, String targetFileName, Filefo
         mm.setGoobiID(String.valueOf(myProzess.getId()));
 
         // if (!ConfigMain.getParameter("ImagePrefix", "\\d{8}").equals("\\d{8}")) {
-        List<String> images = new ArrayList<String>();
+        List<String> images = new ArrayList<>();
         if (ConfigurationHelper.getInstance().isExportValidateImages()) {
             try {
-                // TODO andere Dateigruppen nicht mit image Namen ersetzen
                 images = new MetadatenImagesHelper(this.myPrefs, dd).getDataFiles(myProzess, imageFolderPath);
 
                 int sizeOfPagination = dd.getPhysicalDocStruct().getAllChildren().size();
@@ -354,6 +345,17 @@ protected boolean writeMetsFile(Process myProzess, String targetFileName, Filefo
         return true;
     }
 
+    private VirtualFileGroup createFilegroup(VariableReplacer variableRplacer, ProjectFileGroup projectFileGroup) {
+        VirtualFileGroup v = new VirtualFileGroup();
+        v.setName(projectFileGroup.getName());
+        v.setPathToFiles(variableRplacer.replace(projectFileGroup.getPath()));
+        v.setMimetype(projectFileGroup.getMimetype());
+        v.setFileSuffix(projectFileGroup.getSuffix());
+        v.setFileExtensionsToIgnore(  projectFileGroup.getIgnoreMimetypes());
+        v.setIgnoreConfiguredMimetypeAndSuffix(projectFileGroup.isUseOriginalFiles());
+        return v;
+    }
+
     public List<String> getProblems() {
         return problems;
     }