Changeset 26334 for main/trunk

Timestamp:

2012-10-18T10:02:44+13:00 (12 years ago)

Author:

sjm84

Message:

Fixing the language setting not working correctly when getting collection text. Also correcting missing macrons in Maori

Location:

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

Files:

• core/TransformingReceptionist.java (modified) (1 diff)
• util/XSLTUtil.java (modified) (1 diff)

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

@@ -654 +654 @@
         Element format_elem = (Element) GSXML.getChildByTagName(page_response, GSXML.FORMAT_ELEM);
 
+        NodeList pageElems = doc.getElementsByTagName("page");
+        if (pageElems.getLength() > 0)
+        {
+            Element pageElem = (Element) pageElems.item(0);
+            String langAtt = pageElem.getAttribute(GSXML.LANG_ATT);
+
+            if (langAtt != null && langAtt.length() > 0)
+            {
+                config_params.put("lang", langAtt);
+            }
+        }
+
         if (output.equals("formatelem"))
         {

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

@@ -362 +362 @@
             if (result != null)
             {
-                return docBuilder.parse(new ByteArrayInputStream(("<fragment>" + result + "</fragment>").getBytes())).getDocumentElement();
+                return docBuilder.parse(new ByteArrayInputStream(("<fragment>" + result + "</fragment>").getBytes("UTF-8"))).getDocumentElement();
             }
             return docBuilder.parse(new ByteArrayInputStream(("<fragment>" + "text:" + collection + ":" + key + "</fragment>").getBytes())).getDocumentElement();