Changeset 14225

Timestamp:

2007-07-09T10:27:25+12:00 (17 years ago)

Author:

xiao

Message:

change getFirstChild() to getFirstElementChild() in case an extra line break or white space added before the first element child which might cause a cast exception.

Location:

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

Files:

• AbstractDocumentRetrieve.java (modified) (2 diffs)
• MapRetrieve.java (modified) (1 diff)
• XMLRetrieve.java (modified) (1 diff)
• XSLTServices.java (modified) (2 diffs)

greenstone3/trunk/src/java/org/greenstone/gsdl3/service/AbstractDocumentRetrieve.java

@@ -196 +196 @@
     boolean all_metadata = false;
     // Process the request parameters
-    Element param = (Element) param_list.getFirstChild();
+    Element param = GSXML.getFirstElementChild(param_list);//(Element) param_list.getFirstChild();
     while (param != null) {
         // Identify the metadata information desired
@@ -571 +571 @@
     protected Element addSiblings(Element parent_node, String parent_id, 
                   String current_id) {
-    Element current_node = (Element)parent_node.getFirstChild();
+    Element current_node = GSXML.getFirstElementChild(parent_node);//(Element)parent_node.getFirstChild();
     if (current_node == null) {
         // create a sensible error message

greenstone3/trunk/src/java/org/greenstone/gsdl3/service/MapRetrieve.java

@@ -203 +203 @@
     boolean all_metadata = false;
     // Process the request parameters
-    Element param = (Element) param_list.getFirstChild();
+    Element param = GSXML.getFirstElementChild(param_list);//(Element) param_list.getFirstChild();
 
     while (param != null) {

greenstone3/trunk/src/java/org/greenstone/gsdl3/service/XMLRetrieve.java

@@ -245 +245 @@
     boolean all_metadata = false;
     // Process the request parameters
-    Element param = (Element) param_list.getFirstChild();
+    Element param = GSXML.getFirstElementChild(param_list);//(Element) param_list.getFirstChild();
     while (param != null) {
         // Identify the metadata information desired

greenstone3/trunk/src/java/org/greenstone/gsdl3/service/XSLTServices.java

@@ -115 +115 @@
       logger.info("called with:");
       TransformerFactory transformerFactory = TransformerFactory.newInstance();
-      Element doc = (Element)info.getFirstChild();
+      Element doc = GSXML.getFirstElementChild(info);//(Element)info.getFirstChild();
       Transformer transformer = transformerFactory.newTransformer();
       StreamResult result = new StreamResult(System.out);
@@ -247 +247 @@
       try {
     Document document = stream.nextDocument();
-    Element doc = (Element)document.getFirstChild();
+    Element doc = GSXML.getFirstElementChild(document);//(Element)document.getFirstChild();
     Transformer transformer = transformerFactory.newTransformer();
     StringWriter writer = new StringWriter();