Changeset 25378 for main

Timestamp:

2012-04-12T15:47:24+12:00 (12 years ago)

Author:

ak19

Message:

Java method getInterfaceStringsAsJavascript outputs more of the javascript so that the XSLT has to output less of it.

Location:

main/trunk/greenstone3

Files:

• src/java/org/greenstone/gsdl3/util/XSLTUtil.java (modified) (2 diffs)
• web/interfaces/oran/transform/layouts/header.xsl (modified) (1 diff)
• web/interfaces/oran/transform/util.xsl (modified) (1 diff)

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

@@ -513 +513 @@
     }
 
-    public static String getInterfaceStringsAsJavascript(String interface_name, String lang, String prefix, String prependToPrefix) {   
+    public static String getInterfaceStringsAsJavascript(String interface_name, String lang, String prefix) {   
+    String prependToPrefix = "gs.text";
+    return XSLTUtil.getInterfaceStringsAsJavascript(interface_name, lang, prefix, prependToPrefix);
+    }
+
+    // generates javascript: 2 arrays are declared and populated with strings that declare variables and assign their values
+    // to be strings loaded from the interface_name.properties file for the language.    
+    public static String getInterfaceStringsAsJavascript(String interface_name, String lang, String prefix, String prependToPrefix) {
+    // 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();
+    outputStr.append("if(!gs.text) { ");
+    outputStr.append(prependToPrefix + " = new Array(); ");
+    outputStr.append("}\n");
+    outputStr.append("if(!gs.text." + prefix + ") { ");
+    outputStr.append(prependToPrefix + "." + prefix + " = new Array(); ");
+    outputStr.append("}\n");
     
     Dictionary dict = new Dictionary("interface_" + interface_name, lang);
     Enumeration keys = dict.getKeys();  
     if(keys == null) { // try default interface
-        logger.error("****** Interface name: " + interface_name + " does not have any keys. Trying interface_default.");
+        //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 a string of prependToPrefix.key= "value";\n
-
+    // 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();
@@ -545 +561 @@
     }
 
-
+    // Test from cmdline with:
+    // java -classpath /research/ak19/gs3-svn/web/WEB-INF/lib/gsdl3.jar:/research/ak19/gs3-svn/web/WEB-INF/lib/log4j-1.2.8.jar:/research/ak19/gs3-svn/web/WEB-INF/classes/ org.greenstone.gsdl3.util.XSLTUtil
     public static void main(String args[]) {
     System.out.println("\n@@@@@\n" + XSLTUtil.getInterfaceStringsAsJavascript("default", "en", "dse", "gs.text") + "@@@@@\n");

main/trunk/greenstone3/web/interfaces/oran/transform/layouts/header.xsl

@@ -407 +407 @@
     <xsl:template name="document-editor-language-fragments">
       <!--<gslib:langfrag name="dse"/>-->
-
+      
       <script type="text/javascript">
-      gs.text = new Array();
-      gs.text.dse = new Array();
-      <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceStringsAsJavascript($interface_name, /page/@lang, 'dse', 'gs.text')"/>
+        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceStringsAsJavascript($interface_name, /page/@lang, 'dse')"/>        
       </script>
     </xsl:template>

main/trunk/greenstone3/web/interfaces/oran/transform/util.xsl

@@ -678 +678 @@
   </xsl:template>
 
-  <!-- needs to be name=attrvalue else xsl:param -->
-  <!-- call function with the name prefix (e.g. dse) and the file -->
+  <!-- call function with the name prefix (e.g. dse) -->
   <xsl:template name="langfrag">
     <script type="text/javascript">      
-      gs.text = new Array();
-      gs.text.<xsl:value-of select="@name"/> = new Array();
-      <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceStringsAsJavascript($interface_name, /page/@lang, @name, 'gs.text')"/>
+      <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceStringsAsJavascript($interface_name, /page/@lang, @name)"/>
     </script>
   </xsl:template>