Changeset 38004 for main/trunk/greenstone3/src

Timestamp:

2023-09-04T15:00:41+12:00 (10 months ago)

Author:

kjdon

Message:

added a formatNewLines method, to replace \n with <br/>. Useful for data coming from csv, which gets \n added.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XSLTUtil.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XSLTUtil.java

@@ -760 +760 @@
     }
 
+    public static String formatNewLines(String str, String lang) {
+    if (str == null || str.length() < 1)
+        {
+            return null;
+        }
+    return str.replace("\\n", "<br/>");
+    }   
     public static String escapeNewLines(String str)
     {
@@ -902 +909 @@
             {
                 String key = keys.nextElement();
-                if (key.startsWith(prefix))
+                if (key.startsWith(prefix+"."))
                 {
                     int lastDotIndex = StringUtils.lastIndexOf(key, '.');