allow just one file to be exported for generics

intranda · Aug 12, 2024 · 25c3ed6 · 25c3ed6
1 parent 5062750
commit 25c3ed6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/module-base/src/main/java/de/intranda/goobi/plugins/exporters/GenericExporter.java b/module-base/src/main/java/de/intranda/goobi/plugins/exporters/GenericExporter.java
@@ -46,7 +46,6 @@ public class GenericExporter {
 
     // keep a list of all image files as they need to be renamed
     private Map<String, String> fileMap;
-    private int fileCounter;
     private VariableReplacer vr;
 
     @Getter
@@ -80,7 +79,6 @@ public boolean startExport() {
         vr = new VariableReplacer(dd, prefs, process, null);
         problems = new ArrayList<>();
         fileMap = new HashMap<String, String>();
-        fileCounter = 0;
         log.debug("Export directory for AdmBsmeExportPlugin: " + targetFolder);
         DocStruct topStruct = dd.getLogicalDocStruct();
 
@@ -97,7 +95,7 @@ public boolean startExport() {
         String rightsDetails = vr.replace(config.getString("/rightsDetails"));
         String source = vr.replace(config.getString("/source"));
         String mediaType = vr.replace(config.getString("/mediaType"));
-        //        String mediaGroup = vr.replace(config.getString("/mediaGroup"));
+        // String mediaGroup = vr.replace(config.getString("/mediaGroup"));
         String sourceOrganisation = vr.replace(config.getString("/sourceOrganisation"));
         String eventDate = vr.replace(config.getString("/eventDate"));
         String eventName = vr.replace(config.getString("/eventName"));
@@ -106,7 +104,7 @@ public boolean startExport() {
         String personsInImage = vr.replace(config.getString("/personsInImage"));
         String locations = vr.replace(config.getString("/locations"));
         String description = vr.replace(config.getString("/description"));
-        //        String editorInChief = vr.replace(config.getString("/editorInChief"));
+        // String editorInChief = vr.replace(config.getString("/editorInChief"));
         String format = vr.replace(config.getString("/format"));
         String backprint = vr.replace(config.getString("/backprint"));
 
@@ -160,8 +158,7 @@ public boolean startExport() {
                 // get the new file name for the image and reuse if created previously
                 String exportFileName = fileMap.get(realFileNameWithoutExtension);
                 if (exportFileName == null) {
-                    String counter = String.format("%04d", ++fileCounter);
-                    exportFileName = identifier + "-" + counter;
+                    exportFileName = identifier;
                     fileMap.put(realFileNameWithoutExtension, exportFileName);
                 }
 
@@ -226,6 +223,7 @@ public boolean startExport() {
                 if (StorageProvider.getInstance().isFileExists(txtFile.toPath())) {
                     files.addContent(new Element("text").setText(exportFileName + ".txt").setAttribute("Format", "text/plain"));
                 }
+
             }
         }
 

diff --git a/module-base/src/main/java/de/intranda/goobi/plugins/exporters/SlideExporter.java b/module-base/src/main/java/de/intranda/goobi/plugins/exporters/SlideExporter.java
@@ -45,7 +45,6 @@ public class SlideExporter {
 
     // keep a list of all image files as they need to be renamed
     private Map<String, String> fileMap;
-    private int fileCounter;
     private VariableReplacer vr;
 
     @Getter
@@ -79,7 +78,6 @@ public boolean startExport() {
         vr = new VariableReplacer(dd, prefs, process, null);
         problems = new ArrayList<>();
         fileMap = new HashMap<String, String>();
-        fileCounter = 0;
         log.debug("Export directory for AdmBsmeExportPlugin: " + targetFolder);
         DocStruct topStruct = dd.getLogicalDocStruct();
 
@@ -96,7 +94,7 @@ public boolean startExport() {
         String rightsDetails = vr.replace(config.getString("/rightsDetails"));
         String source = vr.replace(config.getString("/source"));
         String mediaType = vr.replace(config.getString("/mediaType"));
-        String mediaGroup = vr.replace(config.getString("/mediaGroup"));
+        //String mediaGroup = vr.replace(config.getString("/mediaGroup"));
         String sourceOrganisation = vr.replace(config.getString("/sourceOrganisation"));
         String eventDate = vr.replace(config.getString("/eventDate"));
         String eventName = vr.replace(config.getString("/eventName"));
@@ -106,7 +104,7 @@ public boolean startExport() {
         String personsInImage = vr.replace(config.getString("/personsInImage"));
         String locations = vr.replace(config.getString("/locations"));
         String description = vr.replace(config.getString("/description"));
-        String editorInChief = vr.replace(config.getString("/editorInChief"));
+        //String editorInChief = vr.replace(config.getString("/editorInChief"));
         String format = vr.replace(config.getString("/format"));
 
         info.addContent(new Element("Rights_to_Use").setText(rightsToUse));