Changeset 33712

Timestamp:

2019-11-21T14:23:49+13:00 (4 years ago)

Author:

kjdon

Message:

modified createBasicRequest to use userContext methods, and to include editEnabled

File:

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

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

@@ -304 +304 @@
     public static final String USERNAME_ATT = "username";
     public static final String GROUPS_ATT = "groups";
-  public static final String EDIT_ENABLED_ATT = "editEnabled";
+    public static final String EDIT_ENABLED_ATT = "editEnabled";
     public static final String BASE_URL = "baseURL";
 
@@ -925 +925 @@
  
 
-    /** returns a basic request message */
-    public static Element createBasicRequest(Document owner, String request_type, String to, UserContext userContext)
-    {
-        Element request = owner.createElement(REQUEST_ELEM);
-        request.setAttribute(TO_ATT, to);
-        request.setAttribute(TYPE_ATT, request_type);
-        if (userContext != null) { // should we allow this??
-          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);
-            }
-            }
-        }
-        return request;
-    }
+    /** returns a basic request message */
+    public static Element createBasicRequest(Document owner, String request_type, String to, UserContext userContext)
+    {
+    Element request = owner.createElement(REQUEST_ELEM);
+    request.setAttribute(TO_ATT, to);
+    request.setAttribute(TYPE_ATT, request_type);
+    if (userContext == null) {
+        return request; // should we allow this??
+    }
+    request.setAttribute(LANG_ATT, userContext.getLanguage());
+    Element userContextElem = owner.createElement("userContext");
+    request.appendChild(userContextElem);
+    userContextElem.setAttribute(LANG_ATT, userContext.getLanguage());
+    userContextElem.setAttribute(USERNAME_ATT, userContext.getUsername());
+    userContextElem.setAttribute(USER_ID_ATT, userContext.getUserID());
+    userContextElem.setAttribute(GROUPS_ATT, userContext.getGroupsString());
+    userContextElem.setAttribute(EDIT_ENABLED_ATT, userContext.getEditEnabled());
+    
+    return request;
+    }
 
     public static Element createBasicResponse(Document owner, String from)