Changeset 24993 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/DefaultReceptionist.java

Timestamp:

2012-01-26T11:50:17+13:00 (12 years ago)

Author:

sjm84

Message:

Adding UserContext to replace the use of lang and uid

File:

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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/DefaultReceptionist.java

@@ -55 +55 @@
         // see if the collection/cluster element is already there
         String coll_name = coll_param.getAttribute(GSXML.VALUE_ATT);
-        String lang = page_request.getAttribute(GSXML.LANG_ATT);
-        String uid = page_request.getAttribute(GSXML.USER_ID_ATT);
+        UserContext userContext = new UserContext(page_request);
 
         if (coll_name.equals(""))
@@ -84 +83 @@
             // we dont have one yet - get it
             Element coll_about_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-            Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, coll_name, lang, uid);
+            Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, coll_name, userContext);
             coll_about_message.appendChild(coll_about_request);
 
@@ -158 +157 @@
             String name = c.getAttribute(GSXML.NAME_ATT);
             String address = GSPath.appendLink(coll_name, name);
-            Element info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, address, lang, uid);
+            Element info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, address, userContext);
             //Element req_param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
             //req_param_list.appendChild(GSXML.createParameter(this.doc, GSXML.SUBSET_PARAM, GSXML.DISPLAY_TEXT_ELEM+GSXML.LIST_MODIFIER));