Changeset 26557

Timestamp:

2012-12-05T15:13:28+13:00 (11 years ago)

Author:

sjm84

Message:

Fixing string fragments being missing after some being moved to interface_default2.properties

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

@@ -38 +38 @@
 import org.greenstone.util.GlobalProperties;
 import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 
 /**
@@ -143 +142 @@
         return oidParts[0];
     }
-
 
     public static String replace(String orig, String match, String replacement)
@@ -234 +232 @@
     }
 
+    public static String getInterfaceText(String interfaceName, String dictionaryName, String lang, String key, String args_str)
+    {
+        key = key.replaceAll("__INTERFACE_NAME__", interfaceName);
+
+        String[] args = null;
+        if (args_str != null && !args_str.equals(""))
+        {
+            args = StringUtils.split(args_str, ";");
+        }
+        Dictionary dict = new Dictionary(dictionaryName, lang);
+        String result = dict.get(key, args);
+        if (result == null)
+        { // not found
+            //if not found, search a separate subdirectory named by the interface name
+            String sep_interface_dir = interfaceName + File.separatorChar + lang + File.separatorChar + "interface";
+            dict = new Dictionary(sep_interface_dir, lang);
+            result = dict.get(key, args);
+            if (result != null)
+            {
+                result = result.replaceAll("__INTERFACE_NAME__", interfaceName);
+                return result;
+            }
+        }
+
+        if (result == null && !interfaceName.equals("default"))
+        { // not found, try the default interface
+            dict = new Dictionary("interface_default", lang);
+            result = dict.get(key, args);
+        }
+
+        if (result == null)
+        { // not found
+            return "_" + key + "_";
+        }
+        result = result.replaceAll("__INTERFACE_NAME__", interfaceName);
+        return result;
+    }
+
     public static String getInterfaceTextWithDOM(String interface_name, String lang, String key, Node arg_node)
     {
@@ -685 +721 @@
         outputStr.append("}\n");
 
-        Dictionary dict = new Dictionary("interface_" + interface_name, lang);
-        Enumeration keys = dict.getKeys();
-        if (keys == null)
-        { // try default interface
-            //logger.debug("****** Interface name: " + interface_name + " does not have any keys. Trying interface_default.");
-            dict = new Dictionary("interface_default", lang);
-            keys = dict.getKeys();
-        }
-
-        // Get all properties in the language-specific dictionary with the given key prefix
-        // Create Javascript strings of the form:
-        // prependToPrefix.key= "value";\n
-        while (keys.hasMoreElements())
-        {
-            String key = (String) keys.nextElement();
-            if (key.startsWith(prefix))
-            {
-                String value = getInterfaceText(interface_name, lang, key);
-
-                outputStr.append(prependToPrefix);
-                outputStr.append(".");
-                outputStr.append(key);
-                outputStr.append("=\"");
-                outputStr.append(value);
-                outputStr.append("\";\n");
+        int foundCount = 0;
+
+        for (String dictName : new String[] { "interface_" + interface_name, "interface_default", "interface_default2" })
+        {
+            Dictionary dict = new Dictionary(dictName, lang);
+            Enumeration keys = dict.getKeys();
+            if (keys == null)
+            {
+                continue;
+            }
+
+            // Get all properties in the language-specific dictionary with the given key prefix
+            // Create Javascript strings of the form:
+            // prependToPrefix.key= "value";\n
+            while (keys.hasMoreElements())
+            {
+                String key = (String) keys.nextElement();
+                if (key.startsWith(prefix))
+                {
+                    String value = getInterfaceText(interface_name, dictName, lang, key, null);
+
+                    outputStr.append(prependToPrefix);
+                    outputStr.append(".");
+                    outputStr.append(key);
+                    outputStr.append("=\"");
+                    outputStr.append(value);
+                    outputStr.append("\";\n");
+                }
+            }
+
+            if (foundCount > 0)
+            {
+                break;
             }
         }