Changeset 26507 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

Timestamp:

2012-11-23T00:34:55+13:00 (11 years ago)

Author:

davidb

Message:

Support for o=json as output type in Greenstone 3

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java (modified) (3 diffs)

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

@@ -41 +41 @@
 import org.w3c.dom.NodeList;
 
+import org.json.JSONObject;
+import org.json.XML;
+
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
@@ -688 +691 @@
         }
 
-        if (!output.equals("html") && !output.equals("server") && !output.equals("xsltclient"))
+        if (output.equals("json")) {
+            response.setContentType("application/json"); 
+        }
+        else if (!output.equals("html") && !output.equals("server") && !output.equals("xsltclient"))
         {
             response.setContentType("text/xml"); // for now use text
@@ -747 +753 @@
         Node xml_result = this.recept.process(xml_message);
         encodeURLs(xml_result, response);
-        out.println(this.converter.getPrettyString(xml_result));
+
+        String xml_string = this.converter.getPrettyString(xml_result);
+
+        if (output.equals("json")) {
+            try {
+            JSONObject json_obj = org.json.XML.toJSONObject(xml_string);
+            
+            out.println(json_obj.toString());
+            }
+            catch (Exception e) {
+            e.printStackTrace();
+            out.println("Error: failed to convert output XML to JSON format");
+            }
+        }
+        else {
+            out.println(xml_string);
+        }
 
         displaySize(session_ids_table);