Changeset 16105 for greenstone3

Timestamp:

2008-06-23T12:16:22+12:00 (16 years ago)

Author:

ak19

Message:

Changed once more to return formatted string again, and to only trim the string if the first char is whitespace (java code for trim doesn't do the check). Preserves previous change of prepending an <xml> start tag.

File:

• greenstone3/trunk/resources/java/QBRSOAPServer.java.in (modified) (1 diff)

greenstone3/trunk/resources/java/QBRSOAPServer.java.in

@@ -737 +737 @@
         Element response = mr.process(message); 
               // won't be null, MR always returns some response
-        
+
+        // Return it as a String formatted for display
+        String responseMsg = this.converter.getPrettyString(response); 
+                          // this.converter.getString(response);
+
         // In order to avoid "Content is not allowed in prolog" exception on the 
         // web services' client end (problem encountered in GS mailing list), need 
         // to make sure no characters (incl spaces) preceed the  XML sent back 
         // from here. It may also require the <?xml?> tag at the very start.
-        return "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
-            + this.converter.getString(response).trim();
-        // Return it as a String formatted for display
-        // return this.converter.getPrettyString(response); 
-
+        if(responseMsg.charAt(0) == ' ') {
+            responseMsg = responseMsg.trim();
+        }
+        
+        return "<?xml version=\"1.0\" encoding=\"utf-8\"?>"+responseMsg;
     }