Changeset 30477

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

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• LibraryCommandline.java (modified) (1 diff)
• LibraryServlet.java (modified) (3 diffs)
• core/TransformingReceptionist.java (modified) (14 diffs)
• util/Dictionary.java (modified) (5 diffs)
• util/GSConstants.java (modified) (1 diff)
• util/XMLConverter.java (modified) (7 diffs)
• util/XSLTUtil.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryCommandline.java

@@ -60 +60 @@
         config_params.put(GSConstants.SITE_NAME, site_name);
         config_params.put(GSConstants.INTERFACE_NAME, interface_name);
-        config_params.put(GSConstants.ALLOW_CLIENT_SIDE_XSLT, false);
+        config_params.put(GSConstants.USE_CLIENT_SIDE_XSLT, false);
 
         // new message router - create it and pass a handle to recept.

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -126 +126 @@
         String interface_name = config.getInitParameter(GSConstants.INTERFACE_NAME);
 
-        String allowXslt = (String) config.getInitParameter(GSConstants.ALLOW_CLIENT_SIDE_XSLT);
-        supports_client_xslt = allowXslt != null && allowXslt.equals("true");
+        String useXslt = (String) config.getInitParameter(GSConstants.USE_CLIENT_SIDE_XSLT);
+        supports_client_xslt = useXslt != null && useXslt.equals("true");
 
         this.default_lang = config.getInitParameter(GSConstants.DEFAULT_LANG);
@@ -174 +174 @@
         config_params.put(GSConstants.LIBRARY_NAME, library_name);
         config_params.put(GSConstants.INTERFACE_NAME, interface_name);
-        config_params.put(GSConstants.ALLOW_CLIENT_SIDE_XSLT, supports_client_xslt);
+        config_params.put(GSConstants.USE_CLIENT_SIDE_XSLT, supports_client_xslt);
 
         if (site_name != null)
@@ -785 +785 @@
 
         String xml_string = XMLConverter.getPrettyString(xml_result);
-
+        
         if (output.equals("json"))
         {

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

@@ -8 +8 @@
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
 
 import javax.xml.transform.Transformer;
@@ -27 +29 @@
 import org.greenstone.gsdl3.util.XMLConverter;
 import org.greenstone.gsdl3.util.XMLTransformer;
+import org.greenstone.gsdl3.util.XSLTUtil;
 import org.greenstone.util.GlobalProperties;
 import org.w3c.dom.Comment;
@@ -200 +203 @@
         for (File currentFile : xslFiles)
         {
+
+            String full_filename = currentFile.getPath();
+            int sep_pos = full_filename.lastIndexOf(File.separator)+1;
+            String local_filename = full_filename.substring(sep_pos);
+            if (local_filename.startsWith(".")) {
+            logger.warn("Greenstone does not normally rely on 'dot' files for XSL transformations.\n Is the following file intended to be part of the digital library installation?\n XSL File being read in:\n    " + currentFile.getPath());
+            }
+                
             Document currentDoc = this.converter.getDOM(currentFile);
             if (currentDoc == null)
@@ -401 +412 @@
                 }
             }
-        }
+    }
         request.appendChild(request.getOwnerDocument().importNode(extraMetadataList, true));
     }
@@ -409 +420 @@
         // might need to add some data to the page
         addExtraInfo(page);
+
+        
         // transform the page using xslt
-        Node transformed_page = transformPage(page);
-
+
+        String currentInterface = (String) config_params.get(GSConstants.INTERFACE_NAME);
+
+        Element request = (Element) GSXML.getChildByTagName(page, GSXML.PAGE_REQUEST_ELEM);
+        String output = request.getAttribute(GSXML.OUTPUT_ATT);
+
+        boolean useClientXSLT = (Boolean) config_params.get(GSConstants.USE_CLIENT_SIDE_XSLT);
+        //logger.info("Client side transforms allowed? " + allowsClientXSLT);
+
+        if (useClientXSLT)
+        {
+            // if not specified, output defaults to 'html', but this isn't what we want when useClientXSLT is on
+            if (output.equals("html")) {
+            output = "xsltclient";
+            }
+        }
+        Node transformed_page = transformPage(page,currentInterface,output);
+
+        if (useClientXSLT) {
+            return transformed_page;
+        }
         // if the user has specified they want only a part of the full page then subdivide it
         boolean subdivide = false;
         String excerptID = null;
         String excerptTag = null;
-        Element request = (Element) GSXML.getChildByTagName(page, GSXML.PAGE_REQUEST_ELEM);
         Element cgi_param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
         if (cgi_param_list != null)
@@ -517 +548 @@
     }
 
+        protected void replaceNodeWithInterfaceText(Document doc, String interface_name, String lang,
+                            Element elem, String attr_name, String attr_val)
+        {
+        String pattern_str_3arg = "util:getInterfaceText\\([^,]+,[^,]+,\\s*'(.+?)'\\s*\\)";
+        String pattern_str_4arg = "util:getInterfaceText\\([^,]+,[^,]+,\\s*'(.+?)'\\s*,\\s*(.+?)\\s*\\)$";
+    
+        Pattern pattern3 = Pattern.compile(pattern_str_3arg);
+        Matcher matcher3 = pattern3.matcher(attr_val);
+        if (matcher3.find()) {
+        String dict_key = matcher3.group(1);
+        String dict_val = XSLTUtil.getInterfaceText(interface_name,lang,dict_key);
+        
+        Node parent_node = elem.getParentNode();
+
+        Text replacement_text_node = doc.createTextNode(dict_val);
+            parent_node.replaceChild(replacement_text_node,elem);
+        }       
+        else {
+        Pattern pattern4 = Pattern.compile(pattern_str_4arg);
+        Matcher matcher4 = pattern4.matcher(attr_val);
+        StringBuffer string_buffer4 = new StringBuffer();
+
+        if (matcher4.find()) {
+            String dict_key = matcher4.group(1);
+            String args     = matcher4.group(2);
+            args = args.replaceAll("\\$","\\\\\\$");
+            
+            String dict_val = XSLTUtil.getInterfaceText(interface_name,lang,dict_key);
+
+            matcher4.appendReplacement(string_buffer4, "js:getInterfaceTextSubstituteArgs('"+dict_val+"',string("+args+"))");
+            matcher4.appendTail(string_buffer4);
+
+            attr_val = string_buffer4.toString();
+            elem.setAttribute(attr_name,attr_val);
+        }
+        else {
+            logger.error("Failed to find match in attribute: " + attr_name + "=\"" + attr_val + "\"");
+            attr_val = attr_val.replaceAll("util:getInterfaceText\\(.+?,.+?,\\s*(.+?)\\s*\\)","$1");
+            elem.setAttribute(attr_name,attr_val);
+        }
+        }
+    
+    }
+    
+        protected void resolveExtendedNamespaceAttributesXSLT(Document doc, String interface_name, String lang)
+        {
+        String[] attr_list = new String[] {"select","test"};
+
+        // http://stackoverflow.com/questions/13220520/javascript-replace-child-loop-issue
+        // go through nodeList in reverse to avoid the 'skipping' problem, due to
+        // replaceChild() calls removing items from the "live" nodeList
+        
+        NodeList nodeList = doc.getElementsByTagName("*");
+        for (int i=nodeList.getLength()-1; i>=0; i--) {
+        Node node = nodeList.item(i);
+        if (node.getNodeType() == Node.ELEMENT_NODE) {
+            Element elem = (Element)node;       
+            for (String attr_name : attr_list) {
+            if (elem.hasAttribute(attr_name)) {
+                String attr_val = elem.getAttribute(attr_name);
+                
+                if (attr_val.startsWith("util:getInterfaceText(")) {
+                // replace the node with dictionary lookup
+                replaceNodeWithInterfaceText(doc, interface_name,lang, elem,attr_name,attr_val);
+                }                           
+                else if (attr_val.contains("util:")) {
+
+                attr_val = attr_val.replaceAll("util:getInterfaceStringsAsJavascript\\(.+?,.+?,\\s*(.+?)\\)","$1");
+
+                //attr_val = attr_val.replaceAll("util:escapeNewLinesAndQuotes\\(\\s*(.+?)\\s*\\)","'escapeNLandQ $1'");
+                //attr_val = attr_val.replaceAll("util:escapeNewLinesAndQuotes\\(\\s*(.+?)\\s*\\)","$1");                   
+
+                // 'contains()' supported in XSLT 1.0, so OK to change any util:contains() into contains()
+                attr_val = attr_val.replaceAll("util:(contains\\(.+?\\))","$1");
+
+                elem.setAttribute(attr_name,attr_val);
+                }
+
+                if (attr_val.contains("java:")) {
+                if (attr_val.indexOf("getInterfaceTextSubstituteArgs")>=4) {
+                    
+                    attr_val = attr_val.replaceAll("java:.+?\\.(\\w+)\\((.*?)\\)$","js:$1($2)");
+                }
+                
+                elem.setAttribute(attr_name,attr_val);
+                }
+            }
+            }
+            
+        }
+        }
+    }
+
+
+        protected void resolveExtendedNamespaceAttributesXML(Document doc, String interface_name, String lang)
+        {
+        String[] attr_list = new String[] {"src", "href"};
+
+        // http://stackoverflow.com/questions/13220520/javascript-replace-child-loop-issue
+        // go through nodeList in reverse to avoid the 'skipping' problem, due to
+        // replaceChild() calls removing items from the "live" nodeList
+        
+        NodeList nodeList = doc.getElementsByTagName("*");
+        for (int i=nodeList.getLength()-1; i>=0; i--) {
+        Node node = nodeList.item(i);
+        if (node.getNodeType() == Node.ELEMENT_NODE) {
+            Element elem = (Element)node;
+            for (String attr_name : attr_list) {
+            if (elem.hasAttribute(attr_name)) {
+                String attr_val = elem.getAttribute(attr_name);
+
+                if (attr_val.contains("util:getInterfaceText(")) {
+                String pattern_str_3arg = "util:getInterfaceText\\([^,]+,[^,]+,\\s*'(.+?)'\\s*\\)";
+                Pattern pattern3 = Pattern.compile(pattern_str_3arg);
+                Matcher matcher3 = pattern3.matcher(attr_val);
+                
+                StringBuffer string_buffer3 = new StringBuffer();
+                
+                boolean found_match = false;
+                
+                while (matcher3.find()) {
+                    found_match = true;
+                    String dict_key = matcher3.group(1);
+                    String dict_val = XSLTUtil.getInterfaceText(interface_name,lang,dict_key);
+                    
+                    matcher3.appendReplacement(string_buffer3, dict_val);
+                }
+                matcher3.appendTail(string_buffer3);
+                
+                if (found_match) {
+                    attr_val = string_buffer3.toString();
+                    elem.setAttribute(attr_name,attr_val);                  
+                }
+                else {              
+                    logger.error("Failed to find match in attribute: " + attr_name + "=\"" + attr_val + "\"");
+                    attr_val = attr_val.replaceAll("util:getInterfaceText\\(.+?,.+?,\\s*(.+?)\\s*\\)","$1");
+                    elem.setAttribute(attr_name,attr_val);
+                }
+                }
+                else if (attr_val.contains("util:")) {
+
+                logger.error("Encountered unexpected 'util:' prefix exension: " + attr_name + "=\"" + attr_val + "\"");
+                }
+
+                if (attr_val.contains("java:")) {
+                // make anything java: safe from the point of an XSLT without extensions
+                logger.error("Encountered unexpected 'java:' prefix exension: " + attr_name + "=\"" + attr_val + "\"");
+
+                }
+            }
+            }
+            
+        }
+        }
+    }
+
+    
+    
     /**
      * overwrite this to add any extra info that might be needed in the page
@@ -529 +718 @@
      * the page and add it to the xslt before transforming
      */
-    protected Node transformPage(Element page)
+        protected Node transformPage(Element page,String currentInterface,String output)
     {
         _debug = false;
 
-        boolean allowsClientXSLT = (Boolean) config_params.get(GSConstants.ALLOW_CLIENT_SIDE_XSLT);
-        //System.out.println("Client side transforms allowed? " + allowsClientXSLT);
-
-        String currentInterface = (String) config_params.get(GSConstants.INTERFACE_NAME);
-
         Element request = (Element) GSXML.getChildByTagName(page, GSXML.PAGE_REQUEST_ELEM);
-        String output = request.getAttribute(GSXML.OUTPUT_ATT);
-
-        //System.out.println("Current output mode is: " + output + ", current interface name is: " + currentInterface);
-
-        if (allowsClientXSLT)
-        {
-            if (!currentInterface.endsWith(GSConstants.CLIENT_SIDE_XSLT_INTERFACE_SUFFIX) && output.equals("html"))
-            {
-                System.out.println("output is html and we are not currently using a client side version, switching");
-                // Switch the interface
-                config_params.put(GSConstants.INTERFACE_NAME, currentInterface.concat(GSConstants.CLIENT_SIDE_XSLT_INTERFACE_SUFFIX));
-            }
-            else if ((currentInterface.endsWith(GSConstants.CLIENT_SIDE_XSLT_INTERFACE_SUFFIX) && !output.equals("html")) || output.equals("server"))
-            {
-                // The reverse needs to happen too
-                config_params.put(GSConstants.INTERFACE_NAME, currentInterface.substring(0, currentInterface.length() - GSConstants.CLIENT_SIDE_XSLT_INTERFACE_SUFFIX.length()));
-            }
-        }
-        else if (currentInterface.endsWith(GSConstants.CLIENT_SIDE_XSLT_INTERFACE_SUFFIX))
-        {
-            config_params.put(GSConstants.INTERFACE_NAME, currentInterface.substring(0, currentInterface.length() - GSConstants.CLIENT_SIDE_XSLT_INTERFACE_SUFFIX.length()));
-        }
-
+
+        //logger.info("Current output mode is: " + output + ", current interface name is: " + currentInterface);
+        
         // DocType defaults in case the skin doesn't have an "xsl:output" element
         String qualifiedName = "html";
@@ -573 +737 @@
         if (output.equals("xsltclient"))
         {
+                String baseURL = request.getAttribute(GSXML.BASE_URL);
+                
             // If you're just getting the client-side transform page, why bother with the rest of this?
             Element html = docWithDoctype.createElement("html");
             Element img = docWithDoctype.createElement("img");
-            img.setAttribute("src", "interfaces/default/images/loading.gif"); // Make it dynamic
+            img.setAttribute("src", "loading.gif"); // Make it dynamic
             img.setAttribute("alt", "Please wait...");
             Text title_text = docWithDoctype.createTextNode("Please wait..."); // Make this language dependent
             Element head = docWithDoctype.createElement("head");
+
+            // e.g., <base href="http://localhost:8383/greenstone3/" /><!-- [if lte IE 6]></base><![endif] -->
+            Element base = docWithDoctype.createElement("base");
+            base.setAttribute("href",baseURL);
+            Comment opt_end_base = docWithDoctype.createComment("[if lte IE 6]></base><![endif]");
+            
             Element title = docWithDoctype.createElement("title");
             title.appendChild(title_text);
+
             Element body = docWithDoctype.createElement("body");
+
+            Element jquery_script = docWithDoctype.createElement("script");
+            jquery_script.setAttribute("src", "jquery-1.10-min.js");
+            jquery_script.setAttribute("type", "text/javascript");
+            Comment jquery_comment = docWithDoctype.createComment("jQuery");
+            jquery_script.appendChild(jquery_comment);
+
+            Element saxonce_script = docWithDoctype.createElement("script");
+            saxonce_script.setAttribute("src", "Saxonce/Saxonce.nocache.js");
+            saxonce_script.setAttribute("type", "text/javascript");
+            Comment saxonce_comment = docWithDoctype.createComment("SaxonCE");
+            saxonce_script.appendChild(saxonce_comment);
+
+            Element xsltutil_script = docWithDoctype.createElement("script");
+            xsltutil_script.setAttribute("src", "xslt-util.js");
+            xsltutil_script.setAttribute("type", "text/javascript");
+            Comment xsltutil_comment = docWithDoctype.createComment("JavaScript version of XSLTUtil.java");
+            xsltutil_script.appendChild(xsltutil_comment);
+
             Element script = docWithDoctype.createElement("script");
-            Element jquery = docWithDoctype.createElement("script");
-            jquery.setAttribute("src", "jquery.js");
-            jquery.setAttribute("type", "text/javascript");
-            Comment jquery_comment = docWithDoctype.createComment("jQuery");
             Comment script_comment = docWithDoctype.createComment("Filler for browser");
-            script.setAttribute("src", "test.js");
+            script.setAttribute("src", "client-side-xslt.js");
             script.setAttribute("type", "text/javascript");
+            script.appendChild(script_comment);
+            
             Element pagevar = docWithDoctype.createElement("script");
             Element style = docWithDoctype.createElement("style");
@@ -599 +789 @@
 
             html.appendChild(head);
+            head.appendChild(base); head.appendChild(opt_end_base);
             head.appendChild(title);
             head.appendChild(style);
@@ -604 +795 @@
             html.appendChild(body);
             head.appendChild(pagevar);
-            head.appendChild(jquery);
+            head.appendChild(jquery_script);
+            head.appendChild(saxonce_script);
+            head.appendChild(xsltutil_script);
             head.appendChild(script);
             pagevar.appendChild(page_var_text);
-            jquery.appendChild(jquery_comment);
-            script.appendChild(script_comment);
+
             body.appendChild(img);
             docWithDoctype.appendChild(html);
@@ -653 +845 @@
             siteName.appendChild(siteNameText);
 
+            Element clientSideXSLTName = theXML.createElement("param");
+            clientSideXSLTName.setAttribute("name", "use_client_side_xslt");
+            Boolean useClientXSLT = (Boolean) config_params.get(GSConstants.USE_CLIENT_SIDE_XSLT);
+            Text clientSideXSLTNameText = theXML.createTextNode(useClientXSLT.toString());
+            clientSideXSLTName.appendChild(clientSideXSLTNameText);
+            
             Element filepath = theXML.createElement("param");
             filepath.setAttribute("name", "filepath");
@@ -661 +859 @@
             root.appendChild(intname);
             root.appendChild(siteName);
+            root.appendChild(clientSideXSLTName);
             root.appendChild(filepath);
 
@@ -916 +1115 @@
             return converter.getDOM(getStringFromDocument(skinAndLibraryXsl));
         }
-        if (output.equals("skinandlibdoc") || output.equals("clientside"))
+        if (output.equals("skinandlibdoc"))
         {
 
             Node skinAndLib = converter.getDOM(getStringFromDocument(skinAndLibraryDoc));
-
-            if (output.equals("skinandlibdoc"))
-            {
-                return skinAndLib;
-            }
-            else
-            {
-                // Send XML and skinandlibdoc down the line together
-                Document finalDoc = converter.newDOM();
-                Node finalDocSkin = finalDoc.importNode(skinAndLibraryDoc.getDocumentElement(), true);
-                Node finalDocXML = finalDoc.importNode(theXML.getDocumentElement(), true);
-                Element root = finalDoc.createElement("skinlibPlusXML");
-                root.appendChild(finalDocSkin);
-                root.appendChild(finalDocXML);
-                finalDoc.appendChild(root);
-                return (Node) finalDoc.getDocumentElement();
-            }
+            return skinAndLib;          
         }
         if (output.equals("oldskindoc"))
@@ -1018 +1201 @@
         }
 
-        if (output.equals("skinandlibdocfinal"))
-        {
-            return converter.getDOM(getStringFromDocument(skinAndLibraryDoc));
+        if (output.equals("skinandlibdocfinal") || output.equals("clientside"))
+        {
+            if (output.equals("skinandlibdocfinal"))
+            {
+                    Node skinAndLibFinal = converter.getDOM(getStringFromDocument(skinAndLibraryDoc));
+                return skinAndLibFinal;
+            }
+            else
+            {
+                    // Go through and 'fix up' any 'util:...' or 'java:...' attributes the skinAndLibraryDoc has
+                    String lang = (String)config_params.get("lang");
+                    resolveExtendedNamespaceAttributesXSLT(skinAndLibraryDoc,currentInterface,lang); // test= and select= attributes
+                resolveExtendedNamespaceAttributesXML(skinAndLibraryDoc,currentInterface,lang);  // href= and src= attributes
+                Node skinAndLibFinal = converter.getDOM(getStringFromDocument(skinAndLibraryDoc));
+                
+                // Send XML and skinandlibdoc down the line together
+                Document finalDoc = converter.newDOM();
+                Node finalDocSkin = finalDoc.importNode(skinAndLibraryDoc.getDocumentElement(), true);
+                Node finalDocXML = finalDoc.importNode(theXML.getDocumentElement(), true);
+                Element root = finalDoc.createElement("skinlibfinalPlusXML");
+                root.appendChild(finalDocSkin);
+                root.appendChild(finalDocXML);
+                finalDoc.appendChild(root);
+                return (Node) finalDoc.getDocumentElement();
+            }
+
+
+
+            
         }
 

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)

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

@@ -28 +28 @@
     public static final String BASE_INTERFACES = "base_interfaces";
     public static final String DEFAULT_LANG = "default_lang";
-    public static final String ALLOW_CLIENT_SIDE_XSLT = "allow_client_side_xslt";
-    public static final String CLIENT_SIDE_XSLT_INTERFACE_SUFFIX = "-client-xslt";
+    public static final String USE_CLIENT_SIDE_XSLT = "use_client_side_xslt";
+        //public static final String CLIENT_SIDE_XSLT_INTERFACE_SUFFIX = "-client-xslt";
 
     public static final String META_RELATION_SEP = "_";

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

@@ -94 +94 @@
         {
             logger.error(e.getMessage());
+            logger.error("Input string was:\n" + in);
+            e.printStackTrace();
         }
         return null;
@@ -113 +115 @@
         {
             logger.error(e.getMessage());
+            logger.error("Input string was:\n" + in);
+            e.printStackTrace();
         }
         return null;
@@ -131 +135 @@
         {
             logger.error(e.getMessage(), e);
+            logger.error("File was:\n" + in.getPath());
+            e.printStackTrace();
 
         }
@@ -156 +162 @@
       {
     logger.error(e.getMessage());
+    logger.error("File was:\n" + in.getPath());
+    e.printStackTrace();
       }
     return null;
@@ -170 +178 @@
       {
     logger.error(e.getMessage());
+    logger.error("File was:\n" + in.getPath());
+    e.printStackTrace();
       }
     return null;
@@ -199 +209 @@
       
       logger.error(e.getMessage());
+      logger.error("InputSource:\n");
+      e.printStackTrace();
     }
     return null;
@@ -337 +349 @@
                 xmlRepresentation.append(attribute.getNodeName());
                 xmlRepresentation.append("=\"");
-                xmlRepresentation.append(attribute.getNodeValue());
+                String attr_val = attribute.getNodeValue();
+                
+                attr_val = attr_val.replaceAll("&","&");
+                attr_val = attr_val.replaceAll("<","&lt;");
+                attr_val = attr_val.replaceAll(">","&gt;");
+                attr_val = attr_val.replaceAll("\"","&quot;");
+                // assume that any of the above chars that was already entity escaped
+                // was already correct => return back to how they were
+                attr_val = attr_val.replaceAll("&amp;amp;","&amp;");
+                attr_val = attr_val.replaceAll("&amp;lt;","&lt;");
+                attr_val = attr_val.replaceAll("&amp;gt;","&gt;");
+                attr_val = attr_val.replaceAll("&amp;quot;","&quot;");
+                
+                
+                xmlRepresentation.append(attr_val);
                 xmlRepresentation.append("\"");
             }

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

@@ -345 +345 @@
     }
 
+
+        public static String getInterfaceTextSubstituteArgs(String value, String args_str)
+    {
+        String[] args = null;
+        if (args_str != null && !args_str.equals("")) {
+        args = StringUtils.split(args_str, ";");
+        }
+
+        return Dictionary.processArgs(value,args);
+    }
+        
     public static Node getCollectionText(String collection, String site_name, String lang, String key)
     {