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

Timestamp:

2021-10-26T12:21:07+13:00 (2 years ago)

Author:

cstephen

Message:

Add support for multiple namespaces in interface property keys; i.e. lots of dots :)

File:

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

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

@@ -29 +29 @@
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Locale;
 
@@ -831 +832 @@
     public static String getInterfaceStringsAsJavascript(String interface_name, String lang, String prefix, String prependToPrefix)
     {
-          // now we allow looking for files in the interface's resources folder
-          CustomClassLoader my_loader = new CustomClassLoader(XSLTUtil.class.getClassLoader(), GSFile.interfaceResourceDir(GlobalProperties.getGSDL3Home(), interface_name));
-      String prefixwithdot = prefix+".";
+        // now we allow looking for files in the interface's resources folder
+        CustomClassLoader my_loader = new CustomClassLoader(XSLTUtil.class.getClassLoader(), GSFile.interfaceResourceDir(GlobalProperties.getGSDL3Home(), interface_name));
+        String prefixwithdot = prefix + ".";
+
         // 1. Generating Javascript of the form:
         // if(!gs.text) { gs.text = new Array(); }
         // if(!gs.text.dse) { gs.text.dse = new Array(); }
+
         StringBuffer outputStr = new StringBuffer();
+        HashSet<String> initialisedDepths = new HashSet<>();
+
         outputStr.append("if(!" + prependToPrefix + ") { ");
         outputStr.append(prependToPrefix + " = new Array(); ");
         outputStr.append("}\n");
-        outputStr.append("if(!" + prependToPrefix + "." + prefix + ") { ");
-        outputStr.append(prependToPrefix + "." + prefix + " = new Array(); ");
-        outputStr.append("}\n");
+        initialisedDepths.add(prependToPrefix);
+
+        // Handle '.' characters in the prefix. JS identifies these as object accessors, hence requiring a new array for each 'level'.
+        String currentDepth = prependToPrefix;
+        String[] prefixComponents = prefix.split("\\.");
+
+        for (String element : prefixComponents) {
+            currentDepth += "." + element;
+
+            outputStr.append("if(!" + currentDepth + ") { ");
+            outputStr.append(currentDepth + " = new Array(); ");
+            outputStr.append("}\n");
+
+            initialisedDepths.add(currentDepth);
+        }
 
         int foundCount = 0;
@@ -849 +866 @@
         for (String dictName : new String[] { "interface_" + interface_name, "interface_default", "interface_default2" })
         {
-          // get all the keys from the english dictionary as this is a complete set
-                  Dictionary dict = new Dictionary(dictName, "en", my_loader);
+            // get all the keys from the english dictionary as this is a complete set
+            Dictionary dict = new Dictionary(dictName, "en", my_loader);
             Enumeration keys = dict.getKeys();
             if (keys == null)
@@ -865 +882 @@
                 if (key.startsWith(prefixwithdot))
                 {
+                    String[] keyComponents = key.split("\\.");
+                    currentDepth = prependToPrefix + "." + prefix;
+
+                    for (int i = prefixComponents.length; i < keyComponents.length - 1; i++) {
+                        currentDepth += "." + keyComponents[i];
+
+                        if (initialisedDepths.contains(currentDepth)) {
+                            continue;
+                        }
+
+                        outputStr.append("if(!" + currentDepth + ") { ");
+                        outputStr.append(currentDepth + " = new Array(); ");
+                        outputStr.append("}\n");
+
+                        initialisedDepths.add(currentDepth);
+                    }
+
                   // get the language dependent value for the key. This will return the english if no value found for the given lang
                     String value = getInterfaceText(interface_name, dictName, lang, key, null);