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

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

@@ -12 +12 @@
 // other java stuff
 import java.io.File;
-import java.util.HashMap;
 import java.util.*;
 import java.io.StringReader;
@@ -46 +45 @@
     
         String subaction = request.getAttribute(GSXML.SUBACTION_ATT);
-        String lang = request.getAttribute(GSXML.LANG_ATT);
-        String uid = request.getAttribute(GSXML.USER_ID_ATT);
+        UserContext userContext = new UserContext(request);
         // get the param list
         Element cgi_param_list = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
@@ -64 +62 @@
 
         Element mr_request_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-        Element mr_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT_STRING, to, lang, uid);
+        Element mr_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT_STRING, to, userContext);
 
         mr_request.setAttribute("service", service);