Changeset 26506 for main/trunk/greenstone3

Timestamp:

2012-11-23T00:34:36+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/core/TransformingReceptionist.java (modified) (2 diffs)

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

@@ -593 +593 @@
         Document theXML = null;
 
-        if (output.equals("xml") || output.equals("clientside"))
+        if (output.equals("xml") || (output.equals("json")) || output.equals("clientside"))
         {
             // Append some bits and pieces first...
@@ -628 +628 @@
             root.appendChild(filepath);
 
-            if (output.equals("xml"))
-                return theXML.getDocumentElement();
-        }
+            if ((output.equals("xml")) || output.equals("json")) {
+                // in the case of "json", calling method responsible for converting to JSON-string
+                return theXML.getDocumentElement();
+            }
+        }
+
 
         Element cgi_param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);