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

Timestamp:

2012-10-17T13:51:35+13:00 (12 years ago)

Author:

sjm84

Message:

Changing how collection text is retrieved so that they can contain gsf elements. The downside is that it <fragment> elements turn up in the HTML. Possibly need a better solution in the future

File:

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

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

@@ -19 +19 @@
 package org.greenstone.gsdl3.util;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.text.SimpleDateFormat;
@@ -26 +27 @@
 import java.util.HashMap;
 import java.util.Locale;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
 
 import net.tanesha.recaptcha.ReCaptcha;
@@ -50 +54 @@
         _stringVariables.put(name, value);
     }
-    
+
     public static String getString(String name)
     {
         return _stringVariables.get(name);
     }
-    
+
     /* some tests */
     public static boolean equals(String s1, String s2)
@@ -292 +296 @@
     }
 
-    public static String getCollectionText(String collection, String site_name, String lang, String key)
-    {
-      return getCollectionTextWithArgs(collection, site_name, lang, key, null);
-    }
-
-  public static String getCollectionText(String collection, String site_name, String lang, String key, String args_str)
-  {
-
-    String[] args = null;
-    if (args_str != null && !args_str.equals(""))
-      {
-    args = StringUtils.split(args_str, ";");
-      }
-
-    return getCollectionTextWithArgs(collection, site_name, lang, key, args);
-  }
+    public static Node getCollectionText(String collection, String site_name, String lang, String key)
+    {
+        return getCollectionTextWithArgs(collection, site_name, lang, key, null);
+    }
+
+    public static Node getCollectionText(String collection, String site_name, String lang, String key, String args_str)
+    {
+
+        String[] args = null;
+        if (args_str != null && !args_str.equals(""))
+        {
+            args = StringUtils.split(args_str, ";");
+        }
+
+        return getCollectionTextWithArgs(collection, site_name, lang, key, args);
+    }
 
     // xslt didn't like calling the function with Node varargs, so have this hack for now
-    public static String getCollectionTextWithDOM(String collection, String site_name, String lang, String key, Node n1)
+    public static Node getCollectionTextWithDOM(String collection, String site_name, String lang, String key, Node n1)
     {
         return getCollectionTextWithDOMMulti(collection, site_name, lang, key, n1);
     }
 
-    public static String getCollectionTextWithDOM(String collection, String site_name, String lang, String key, Node n1, Node n2)
+    public static Node getCollectionTextWithDOM(String collection, String site_name, String lang, String key, Node n1, Node n2)
     {
         return getCollectionTextWithDOMMulti(collection, site_name, lang, key, n1, n2);
     }
 
-    public static String getCollectionTextWithDOM(String collection, String site_name, String lang, String key, Node n1, Node n2, Node n3)
+    public static Node getCollectionTextWithDOM(String collection, String site_name, String lang, String key, Node n1, Node n2, Node n3)
     {
         return getCollectionTextWithDOMMulti(collection, site_name, lang, key, n1, n2, n3);
     }
 
-    public static String getCollectionTextWithDOM(String collection, String site_name, String lang, String key, Node n1, Node n2, Node n3, Node n4)
+    public static Node getCollectionTextWithDOM(String collection, String site_name, String lang, String key, Node n1, Node n2, Node n3, Node n4)
     {
         return getCollectionTextWithDOMMulti(collection, site_name, lang, key, n1, n2, n3, n4);
     }
 
-    public static String getCollectionTextWithDOMMulti(String collection, String site_name, String lang, String key, Node... nodes)
+    public static Node getCollectionTextWithDOMMulti(String collection, String site_name, String lang, String key, Node... nodes)
     {
         int num_nodes = nodes.length;
@@ -340 +344 @@
             for (int i = 0; i < num_nodes; i++)
             {
-
                 String node_str = XMLConverter.getString(nodes[i]);
                 args[i] = node_str;
@@ -348 +351 @@
     }
 
-  public static String getCollectionTextWithArgs(String collection, String site_name, String lang, String key, String [] args) {
-
-        CollectionClassLoader class_loader = new CollectionClassLoader(XSLTUtil.class.getClassLoader(), GSFile.siteHome(GlobalProperties.getGSDL3Home(), site_name), collection);
-        Dictionary dict = new Dictionary(collection, lang, class_loader);
-        String result = dict.get(key, args);
-        if (result != null)
-        {
-            return result;
-        }
-        return "text:" + collection + ":" + key;
-
+    public static Node getCollectionTextWithArgs(String collection, String site_name, String lang, String key, String[] args)
+    {
+        try
+        {
+            DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+
+            CollectionClassLoader class_loader = new CollectionClassLoader(XSLTUtil.class.getClassLoader(), GSFile.siteHome(GlobalProperties.getGSDL3Home(), site_name), collection);
+            Dictionary dict = new Dictionary(collection, lang, class_loader);
+            String result = dict.get(key, args);
+            if (result != null)
+            {
+                return docBuilder.parse(new ByteArrayInputStream(("<fragment>" + result + "</fragment>").getBytes())).getDocumentElement();
+            }
+            return docBuilder.parse(new ByteArrayInputStream(("<fragment>" + "text:" + collection + ":" + key + "</fragment>").getBytes())).getDocumentElement();
+        }
+        catch (Exception ex)
+        {
+            return null;
+        }
     }