Changeset 30477 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/Dictionary.java

Timestamp:

2016-04-20T22:50:52+12:00 (8 years ago)

Author:

davidb

Message:

Changes in the Java code to support the new approach taken to client-side XSLT (using Saxon-CE JS library in the browser -- see next commit). Also some better error reporting when processing XSLT files

File:

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

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

@@ -140 +140 @@
     }
 
+        public static String processArgs(String initial, String args[])
+        {
+        // If the string contains arguments we have to insert them.
+        StringBuffer complete = new StringBuffer();
+        // While we still have initial string left.
+        while (initial.length() > 0 && initial.indexOf('{') != -1 && initial.indexOf('}') != -1)
+        {
+            // Remove preamble
+            int opening = initial.indexOf('{');
+            int closing = initial.indexOf('}');
+            int comment_mark = initial.indexOf('-', opening); // May not exist
+            if (comment_mark > closing)
+            { // May also be detecting a later comment
+                comment_mark = -1;
+            }
+            complete.append(initial.substring(0, opening));
+            
+            // Parse arg_num
+            String arg_str = null;
+            if (comment_mark != -1)
+            {
+                arg_str = initial.substring(opening + 1, comment_mark);
+            }
+            else
+            {
+                arg_str = initial.substring(opening + 1, closing);
+            }
+            if (closing + 1 < initial.length())
+            {
+                initial = initial.substring(closing + 1);
+            }
+            else
+            {
+                initial = "";
+            }
+            int arg_num = Integer.parseInt(arg_str);
+            // Insert argument
+            if (args != null && 0 <= arg_num && arg_num < args.length)
+            {
+                complete.append(args[arg_num]);
+            }
+        }
+        complete.append(initial);
+        return complete.toString();     
+    }
+    
     /**
      * Used to retrieve a property value from the Locale specific
@@ -162 +208 @@
     public String get(String key, String args[])
     {
+        // The following 'argsStr' doesn't appear to be used in rest of method, so
+        // commenting out
+        /*
         String argsStr = "";
         if (args != null)
@@ -170 +219 @@
             }
         }
-
+        */
+        
         if (this.raw == null)
         {
@@ -186 +236 @@
                 return initial;
             }
+
+            return processArgs(initial,args);
+            /*
             // If the string contains arguments we have to insert them.
             StringBuffer complete = new StringBuffer();
@@ -228 +281 @@
             complete.append(initial);
             return complete.toString();
+            */
         }
         catch (Exception e)