added new method to get all occurrences of a metadata field in variable

replacer
intranda · Jan 16, 2019 · 0314dfc · 0314dfc
1 parent c656fce
commit 0314dfc
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/Goobi/src/de/sub/goobi/helper/VariableReplacer.java b/Goobi/src/de/sub/goobi/helper/VariableReplacer.java
@@ -315,7 +315,7 @@ public String replace(String inString) {
 
             for (MatchResult r : findRegexMatches("\\$?(?:\\(|\\{)db_meta\\.([^)]+)(?:\\}|\\))", inString)) {
                 String metadataName = r.group(1);
-                String value = MetadataManager.getMetadataValue(process.getId(), metadataName);
+                String value = MetadataManager.getAllValuesForMetadata(process.getId(), metadataName);
                 inString = inString.replace(r.group(), value);
             }
 

diff --git a/Goobi/src/de/sub/goobi/persistence/managers/MetadataManager.java b/Goobi/src/de/sub/goobi/persistence/managers/MetadataManager.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
@@ -117,6 +117,15 @@ public static String getMetadataValue(int processId, String metadataName) {
         return "";
     }
 
+    public static String getAllValuesForMetadata(int processId, String metadataName) {
+        try {
+            return MetadataMysqlHelper.getAllValuesForMetadata(processId, metadataName);
+        } catch (SQLException e) {
+            logger.error(e);
+        }
+        return "";
+    }
+
 
     public static List<String> getAllMetadataValues(int processId, String metadataName) {
         try {

diff --git a/Goobi/src/de/sub/goobi/persistence/managers/MetadataMysqlHelper.java b/Goobi/src/de/sub/goobi/persistence/managers/MetadataMysqlHelper.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
@@ -197,6 +197,20 @@ public static String getMetadataValue(int processId, String metadataName) throws
     }
 
 
+    public static String getAllValuesForMetadata(int processId, String metadataName) throws SQLException {
+        String sql = "SELECT print FROM metadata WHERE processid = ? and name = ?";
+        Connection connection = null;
+        try {
+            connection = MySQLHelper.getInstance().getConnection();
+            return new QueryRunner().query(connection, sql, MySQLHelper.resultSetToStringHandler, processId, metadataName);
+        } finally {
+            if (connection != null) {
+                MySQLHelper.closeConnection(connection);
+            }
+        }
+    }
+
+
     public static List<String> getAllMetadataValues(int processId, String metadataName) throws SQLException {
         String sql = "SELECT value FROM metadata WHERE processid = ? and name = ?";
         Connection connection = null;