Changeset 24052 for main/trunk/greenstone3/src

Timestamp:

2011-05-19T13:38:12+12:00 (13 years ago)

Author:

sjm84

Message:

The hhf cgi parameter is now implemented using JSON, also a few other minor commits

File:

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

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

@@ -15 +15 @@
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.io.File;
+import java.lang.reflect.Type;
 import java.util.Hashtable;
 import org.apache.log4j.*;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 
 // Apache Commons
@@ -560 +566 @@
         
         //Add custom HTTP headers if requested
-        String httpHeaders = StringEscapeUtils.unescapeHtml4(request.getParameter(GSParams.HTTPHEADERFIELDS));
-        if (httpHeaders!=null && !httpHeaders.equals ("")) {
-            String[] headerParams = StringUtils.split(httpHeaders, "&");
-            
-            for(int j = 0; j < headerParams.length; j++)
+        Gson gson = new Gson();
+        Type type = new TypeToken<List<Map<String,String>>>() {}.getType();
+        List<Map<String,String>> httpHeaders = gson.fromJson(request.getParameter(GSParams.HTTPHEADERFIELDS), type);
+        if (httpHeaders != null && httpHeaders.size() > 0) {
+            
+            for(int j = 0; j < httpHeaders.size(); j++)
             {
-                int index = StringUtils.indexOf(headerParams[j], "=");
+                Map nameValueMap = (Map)httpHeaders.get(j);
+                String name = (String)nameValueMap.get("name");
+                String value = (String)nameValueMap.get("value");
                 
-                if(index != -1)
+                System.err.println("SETTING HEADER " + name + " = " + value);
+                
+                if(name != null && value != null)
                 {
-                    response.setHeader(StringUtils.substring(headerParams[j], 0, index), StringUtils.substring(headerParams[j], index+1));
-                }
-            }
-            
+                    response.setHeader(name, value);
+                }
+            }
         }
         
@@ -689 +699 @@
         
     }
-
 }