Changeset 27073 for main/trunk

Timestamp:

2013-03-13T14:11:28+13:00 (11 years ago)

Author:

sjm84

Message:

Reformatting this file ahead of some changes

File:

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

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

@@ -36 +36 @@
 import org.greenstone.gsdl3.util.UserContext;
 import org.greenstone.gsdl3.util.XMLConverter;
+import org.json.JSONObject;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-
-import org.json.JSONObject;
-import org.json.XML;
 
 import com.google.gson.Gson;
@@ -691 +689 @@
         }
 
-        if (output.equals("json")) {
-            response.setContentType("application/json"); 
+        if (output.equals("json"))
+        {
+            response.setContentType("application/json");
         }
         else if (!output.equals("html") && !output.equals("server") && !output.equals("xsltclient"))
@@ -756 +755 @@
         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);
+        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);
         }