Changeset 26086 for main/trunk/greenstone3

Timestamp:

2012-08-09T11:08:41+12:00 (12 years ago)

Author:

kjdon

Message:

due to the way we call formatting functions from xslt, I have made them all have the same arguments, string and lang.

File:

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

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

@@ -121 +121 @@
     }
 
-    /* some preprocessing functions */
-    public static String toLower(String orig)
-    {
-        return orig.toLowerCase();
-    }
-
-    public static String toUpper(String orig)
-    {
-        return orig.toUpperCase();
-    }
-
-    public static byte[] toUTF8(String orig)
-    {
-        try
-        {
-            byte[] utf8 = orig.getBytes("UTF-8");
-            return utf8;
-        }
-        catch (Exception e)
-        {
-            logger.error("unsupported encoding");
-            return orig.getBytes();
-        }
-    }
 
     public static String replace(String orig, String match, String replacement)
@@ -325 +301 @@
     }
 
+  // formatting /preprocessing functions
+  // some require a language, so we'll have a language param for all
+  public static String toLower(String orig, String lang)
+    {
+        return orig.toLowerCase();
+    }
+
+    public static String toUpper(String orig, String lang)
+    {
+        return orig.toUpperCase();
+    }
+
+    public static byte[] toUTF8(String orig, String lang)
+    {
+        try
+        {
+            byte[] utf8 = orig.getBytes("UTF-8");
+            return utf8;
+        }
+        catch (Exception e)
+        {
+            logger.error("unsupported encoding");
+            return orig.getBytes();
+        }
+    }
+
     public static String formatDate(String date, String lang)
     {
@@ -364 +366 @@
     }
 
-    public static String formatBigNumber(String num)
+    public static String formatBigNumber(String num, String lang)
     {