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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/CrossCollectionSearch.java

@@ -21 +21 @@
 import org.greenstone.gsdl3.util.GSXML;
 import org.greenstone.gsdl3.util.GSPath;
+import org.greenstone.gsdl3.util.UserContext;
 
 import org.w3c.dom.Element;
@@ -147 +148 @@
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
 
-        String lang = request.getAttribute(GSXML.LANG_ATT);
+        UserContext userContext = new UserContext(request);
+        
         // Get the parameters of the request
         Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
@@ -182 +184 @@
         }
         // send the query to all colls
-        Element query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to_att.toString(), lang, "");
+        Element query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to_att.toString(), userContext);
         query_message.appendChild(query_request);
         // should we add params individually?
@@ -257 +259 @@
     protected boolean initCollectionList()
     {
-        String lang = "en";
-        String uid = "";
+        UserContext userContext = new UserContext();
+        userContext.setLanguage("en");
+        userContext.setUserID("");
+
         // first, get the message router info
         Element coll_list_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-        Element coll_list_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", lang, ""); // uid
+        Element coll_list_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", userContext); // uid
         coll_list_message.appendChild(coll_list_request);
         logger.debug("coll list request = " + this.converter.getPrettyString(coll_list_request));
@@ -281 +285 @@
             Element c = (Element) colls.item(i);
             String name = c.getAttribute(GSXML.NAME_ATT);
-            Element metadata_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, name, lang, uid);
+            Element metadata_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, name, userContext);
             metadata_message.appendChild(metadata_request);
         }
@@ -331 +335 @@
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
 
-        String lang = request.getAttribute(GSXML.LANG_ATT);
+        UserContext userContext = new UserContext(request);
         // Get the parameters of the request
         Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
@@ -382 +386 @@
             String cname = (String) e.getKey();
             Element doc_nodes = (Element) e.getValue();
-            Element meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, GSPath.appendLink(cname, DOCUMENT_METADATA_RETRIEVE_SERVICE), lang, "");
+            Element meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, GSPath.appendLink(cname, DOCUMENT_METADATA_RETRIEVE_SERVICE), userContext);
             meta_request.appendChild(doc_nodes);
             meta_request.appendChild(new_param_list.cloneNode(true));