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

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

@@ -68 +68 @@
         }
 
-        String lang = request.getAttribute(GSXML.LANG_ATT);
-        String uid = request.getAttribute(GSXML.USER_ID_ATT);
+        UserContext userContext = new UserContext(request);
         String to = service_name;
         if (collection != null)
@@ -80 +79 @@
             // we have been asked for the service description
             Element mr_info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-            Element mr_info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang, uid);
+            Element mr_info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, userContext);
             mr_info_message.appendChild(mr_info_request);
 
@@ -86 +85 @@
             Element mr_info_response = (Element) this.mr.process(mr_info_message);
             // the response
+            
             Element service_response = (Element) GSXML.getChildByTagName(mr_info_response, GSXML.RESPONSE_ELEM);
 
@@ -96 +96 @@
             // just a display request, no actual processing to do
             //append site metadata
-            addSiteMetadata(page_response, lang, uid);
+            addSiteMetadata(page_response, userContext);
             return page_response;
         }
@@ -105 +105 @@
         { // no query
             //append site metadata
-            addSiteMetadata(page_response, lang, uid);
+            addSiteMetadata(page_response, userContext);
             return page_response;
         }
@@ -111 +111 @@
         // create the query request
         Element mr_query_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-        Element mr_query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
+        Element mr_query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
         mr_query_message.appendChild(mr_query_request);
 
@@ -119 +119 @@
 
         // 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);
         mr_query_message.appendChild(format_request);
 
@@ -131 +131 @@
         {
             //append site metadata
-            addSiteMetadata(page_response, lang, uid);
+            addSiteMetadata(page_response, userContext);
             return page_response;
         }
@@ -167 +167 @@
             page_response.appendChild(this.doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER));
             //append site metadata
-            addSiteMetadata(page_response, lang, uid);
+            addSiteMetadata(page_response, userContext);
             return page_response;
         }
@@ -179 +179 @@
             page_response.appendChild(this.doc.importNode(document_list, true));
             //append site metadata
-            addSiteMetadata(page_response, lang, uid);
+            addSiteMetadata(page_response, userContext);
             return page_response;
         }
@@ -207 +207 @@
             to = GSPath.prependLink(to, collection);
         }
-        Element mr_metadata_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
+        Element mr_metadata_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
         mr_metadata_message.appendChild(mr_metadata_request);
 
@@ -235 +235 @@
         logger.debug("Query page:\n" + this.converter.getPrettyString(page_response));
         //append site metadata
-        addSiteMetadata(page_response, lang, uid);
+        addSiteMetadata(page_response, userContext);
         return page_response;
     }