Changeset 38153 for main/trunk/greenstone3/src

Timestamp:

2023-09-18T14:44:54+12:00 (8 months ago)

Author:

kjdon

Message:

when looking for interface files, in the web/interfaces/xxx/resources folder, we need to remove teh 2 from the name, if its there, eg interface_hnz2.properties will be found in web/interfaces/hnz/resources. also I think we had the list to look through in reverse order

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

@@ -255 +255 @@
     public static String getInterfaceText(String interface_name, String dictionary_name, String lang, String key, String args_str)
     {
-          // 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[] args = null;
+        String i_name = interface_name;
+        if (i_name.endsWith("2")) {
+        i_name = i_name.substring(0, i_name.length()-1);
+        }
+        // now we allow looking for files in the interface's resources folder
+          CustomClassLoader my_loader = new CustomClassLoader(XSLTUtil.class.getClassLoader(), GSFile.interfaceResourceDir(GlobalProperties.getGSDL3Home(), i_name));
+
+      String[] args = null;
         if (args_str != null && !args_str.equals(""))
         {
@@ -266 +271 @@
                 String result = Dictionary.createDictionaryAndGetString(dictionary_name, my_loader, key, lang, args);
         if (result == null) {
+
           // fall back to a general interface text search
           return getInterfaceTextWithArgs(interface_name, lang, key, args);
@@ -305 +311 @@
   {
     // 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 i_name = interface_name;
+      if (i_name.endsWith("2")) {
+      i_name = i_name.substring(0, i_name.length()-1);
+      }
+      CustomClassLoader my_loader = new CustomClassLoader(XSLTUtil.class.getClassLoader(), GSFile.interfaceResourceDir(GlobalProperties.getGSDL3Home(), i_name));
     String result = Dictionary.createDictionaryAndGetString("interface_"+interface_name, my_loader, key, lang, args);
     if (result == null)
-      {  
+      {
     //if not found, search a separate subdirectory named by the interface name. this is used for eg the flax interface. this could be replaced by new class loader option?
     String sep_interface_dir = interface_name + File.separatorChar + lang + File.separatorChar + "interface";
@@ -889 +899 @@
         // The dictionaries to pull keys from
         String[] dictionaries = new String[] {
-            "interface_" + interfaceName,
             "interface_default",
-            "interface_default2"
+            "interface_default2",
+            "interface_" + interfaceName
+
         };