Changeset 24993 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/BrowseAction.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/action/BrowseAction.java (modified) (6 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/BrowseAction.java

@@ -64 +64 @@
     }
 
-    String lang = request.getAttribute(GSXML.LANG_ATT);
-    String uid = request.getAttribute(GSXML.USER_ID_ATT);   
+    UserContext userContext = new UserContext(request); 
     String to = GSPath.appendLink(collection, service_name);
     
@@ -73 +72 @@
     
     Element info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-    Element info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang, uid); 
+    Element info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, userContext); 
     info_message.appendChild(info_request);
     
     // also get the format stuff now if there is some
-    Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, to, lang, uid);
+    Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, to, userContext);
     info_message.appendChild(format_request);
     // process the requests
@@ -92 +91 @@
     
     //append site metadata
-    addSiteMetadata(page_response, lang, uid);
+    addSiteMetadata(page_response, userContext);
 
     // if rt=d, then we are just displaying the service
@@ -135 +134 @@
     // get the browse structure for the selected node
     Element classify_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-    Element classify_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
+    Element classify_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
     classify_message.appendChild(classify_request);
         
@@ -200 +199 @@
     if (cl_nodes.getLength() > 0) {
         did_classifier = true;
-        Element cl_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to+"MetadataRetrieve", lang, uid);
+        Element cl_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to+"MetadataRetrieve", userContext);
         metadata_message.appendChild(cl_meta_request);
         
@@ -237 +236 @@
     if (doc_nodes.getLength() > 0) {
         did_documents = true;
-        Element doc_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, GSPath.appendLink(collection, "DocumentMetadataRetrieve"), lang, uid);
+        Element doc_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, GSPath.appendLink(collection, "DocumentMetadataRetrieve"), userContext);
         metadata_message.appendChild(doc_meta_request);