Changeset 25066 for main/trunk

Timestamp:

2012-02-09T15:38:08+13:00 (12 years ago)

Author:

sjm84

Message:

%26 characters are now turned back into ampersands and there is now better error checking on the JSON conversion

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/DocumentMaker.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/DocumentMaker.java

@@ -372 +372 @@
         HashMap params = GSXML.extractParams(param_list, false);
         String transactionString = (String) params.get("transactions");
-
-        Gson gson = new Gson();
-        Type type = new TypeToken<List<Map<String, String>>>()
-        {
-        }.getType();
-        List<Map<String, String>> transactions = gson.fromJson(transactionString, type);
+        transactionString = transactionString.replace("%26", "&");
+
+        List<Map<String, String>> transactions = null;
+        try
+        {
+            Gson gson = new Gson();
+            Type type = new TypeToken<List<Map<String, String>>>()
+            {
+            }.getType();
+            transactions = gson.fromJson(transactionString, type);
+        }
+        catch(Exception ex)
+        {
+            ex.printStackTrace();
+        }
 
         ArrayList<String> collectionsToBuild = new ArrayList<String>();
@@ -439 +448 @@
                     
                     _GSDM.documentXMLSetText(oid, collection, newContent, userContext);
-                    
-                    System.err.println(newContent);
                 }