Changeset 28850 for main

Timestamp:

2014-02-27T11:25:07+13:00 (10 years ago)

Author:

kjdon

Message:

moved a couple of methods here from OAIXML as they are just generic xml stuff. With OAIserver I am creating a request with no user context, so modified createBasicRequest to handle that. Should this be allowed? Should oaiserver use user context???

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSXML.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSXML.java

@@ -320 +320 @@
     }
 
+      public static HashMap<String, String> getParamMap(NodeList params) {
+      HashMap<String, String> map = new HashMap<String, String>();
+      for(int i=0; i<params.getLength(); i++) {
+        Element param = (Element)params.item(i);
+        String param_name = param.getAttribute(NAME_ATT);
+        String param_value = param.getAttribute(VALUE_ATT);
+        map.put(param_name, param_value);
+      }
+      return map;
+    }
+
     public static HashMap<String, Serializable> extractParams(Element xml, boolean deep)
     {
@@ -790 +801 @@
         }
     }
+  
+   public static void copyElement(Element to, Element from, String elem_name) {
+      
+      Document to_doc = to.getOwnerDocument();
+      Node child = from.getFirstChild();
+      while (child != null) {
+        if (child.getNodeName().equals(elem_name)) {
+          to.appendChild(to_doc.importNode(child, true));
+          return;
+        }
+        child = child.getNextSibling();
+      }
+    }
 
     /** returns a basic request message */
@@ -797 +821 @@
         request.setAttribute(TO_ATT, to);
         request.setAttribute(TYPE_ATT, request_type);
-                request.setAttribute(LANG_ATT, userContext._lang);
-        Element userContextElem = owner.createElement("userContext");
-        request.appendChild(userContextElem);
-        userContextElem.setAttribute(LANG_ATT, userContext._lang);
-        userContextElem.setAttribute(USERNAME_ATT, userContext._username);
-        userContextElem.setAttribute(USER_ID_ATT, userContext._userID);
-
-        if (userContext._groups != null)
-        {
-            String groupString = "";
-            for (int i = 0; i < userContext._groups.length; i++)
-            {
-                groupString += userContext._groups[i];
-                if (i != userContext._groups.length - 1)
-                {
-                    groupString += ",";
-                }
-            }
-
-            if (groupString.length() > 0)
-            {
-                userContextElem.setAttribute(GROUPS_ATT, groupString);
-            }
-        }
-
+        request.setAttribute(LANG_ATT, userContext._lang);
+        if (userContext != null) { // should we allow this??
+          Element userContextElem = owner.createElement("userContext");
+          request.appendChild(userContextElem);
+          userContextElem.setAttribute(LANG_ATT, userContext._lang);
+          userContextElem.setAttribute(USERNAME_ATT, userContext._username);
+          userContextElem.setAttribute(USER_ID_ATT, userContext._userID);
+          
+          if (userContext._groups != null)
+            {
+              String groupString = "";
+              for (int i = 0; i < userContext._groups.length; i++)
+            {
+              groupString += userContext._groups[i];
+              if (i != userContext._groups.length - 1)
+                {
+                  groupString += ",";
+                }
+            }
+              
+              if (groupString.length() > 0)
+            {
+              userContextElem.setAttribute(GROUPS_ATT, groupString);
+            }
+            }
+        }
         return request;
     }
@@ -1581 +1606 @@
         return groups;
     }
+
 }