Ignore:
Timestamp:
2012-01-26T11:50:17+13:00 (12 years ago)
Author:
sjm84
Message:

Adding UserContext to replace the use of lang and uid

Location:
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/Action.java

    r24889 r24993  
    232232     *            the current user id
    233233     */
    234     protected void addSiteMetadata(Element element, String lang, String uid)
     234    protected void addSiteMetadata(Element element, UserContext userContext)
    235235    {
    236236        //ADD SITE METADATA
    237         Element metadata_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", lang, uid);
     237        Element metadata_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", userContext);
    238238        //create a hashmap of params
    239239        HashMap subset_params = new HashMap(1);

  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/AppletAction.java

    r24986 r24993  
    4545        boolean coll_specified = true;
    4646        String service_name = (String) params.get(GSParams.SERVICE);
    47         String lang = request.getAttribute(GSXML.LANG_ATT);
    48         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     47        UserContext userContext = new UserContext(request);
    4948        String to = null;
    5049        if (collection == null || collection.equals(""))
    … …  
    6362
    6463            Element mr_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    65             Element mr_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
     64            Element mr_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
    6665            mr_message.appendChild(mr_request);
    6766            // just append all the params for now - should filter out unneeded ones
    … …  
    8180
    8281        Element mr_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    83         Element applet_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang, uid);
     82        Element applet_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, userContext);
    8483        mr_message.appendChild(applet_request);
    8584

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

    r24889 r24993  
    6464    }
    6565
    66     String lang = request.getAttribute(GSXML.LANG_ATT);
    67     String uid = request.getAttribute(GSXML.USER_ID_ATT);   
     66    UserContext userContext = new UserContext(request);
    6867    String to = GSPath.appendLink(collection, service_name);
    6968   
    … …  
    7372   
    7473    Element info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    75     Element info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang, uid);
     74    Element info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, userContext);
    7675    info_message.appendChild(info_request);
    7776   
    7877    // also get the format stuff now if there is some
    79     Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, to, lang, uid);
     78    Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, to, userContext);
    8079    info_message.appendChild(format_request);
    8180    // process the requests
    … …  
    9291   
    9392    //append site metadata
    94     addSiteMetadata(page_response, lang, uid);
     93    addSiteMetadata(page_response, userContext);
    9594
    9695    // if rt=d, then we are just displaying the service
    … …  
    135134    // get the browse structure for the selected node
    136135    Element classify_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    137     Element classify_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
     136    Element classify_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
    138137    classify_message.appendChild(classify_request);
    139138       
    … …  
    200199    if (cl_nodes.getLength() > 0) {
    201200        did_classifier = true;
    202         Element cl_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to+"MetadataRetrieve", lang, uid);
     201        Element cl_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to+"MetadataRetrieve", userContext);
    203202        metadata_message.appendChild(cl_meta_request);
    204203       
    … …  
    237236    if (doc_nodes.getLength() > 0) {
    238237        did_documents = true;
    239         Element doc_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, GSPath.appendLink(collection, "DocumentMetadataRetrieve"), lang, uid);
     238        Element doc_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, GSPath.appendLink(collection, "DocumentMetadataRetrieve"), userContext);
    240239        metadata_message.appendChild(doc_meta_request);
    241240       

  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java

    r24889 r24993  
    9797        has_rl = (String) params.get("rl");//for an external link : get the rl value if it is existing in the params list
    9898        String collection = (String) params.get(GSParams.COLLECTION);
    99         String lang = request.getAttribute(GSXML.LANG_ATT);
    100         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     99        UserContext userContext = new UserContext(request);
    101100        String document_name = (String) params.get(GSParams.DOCUMENT);
    102101        if ((document_name == null || document_name.equals("")) && (has_href == null || has_href.equals("")))
    … …  
    147146
    148147        //append site metadata
    149         addSiteMetadata(page_response, lang, uid);
     148        addSiteMetadata(page_response, userContext);
    150149
    151150        // get the additional data needed for the page
    152         getBackgroundData(page_response, collection, lang, uid);
     151        getBackgroundData(page_response, collection, userContext);
    153152        Element format_elem = (Element) GSXML.getChildByTagName(page_response, GSXML.FORMAT_ELEM);
    154153
    … …  
    263262            Element ds_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    264263            String to = GSPath.appendLink(collection, "DocumentStructureRetrieve");// Hard-wired?
    265             Element ds_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
     264            Element ds_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
    266265            ds_message.appendChild(ds_request);
    267266            ds_request.appendChild(ds_param_list);
    … …  
    339338        Element dm_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    340339        String to = GSPath.appendLink(collection, "DocumentMetadataRetrieve"); // Hard-wired?
    341         Element dm_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
     340        Element dm_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
    342341        dm_message.appendChild(dm_request);
    343342        // Create a parameter list to specify the required metadata information
    … …  
    378377        // we also want a metadata request to the top level document to get
    379378        // assocfilepath - this could be cached too
    380         Element doc_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
     379        Element doc_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
    381380        dm_message.appendChild(doc_meta_request);
    382381        Element doc_meta_param_list = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
    … …  
    432431        Element dc_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    433432        to = GSPath.appendLink(collection, "DocumentContentRetrieve"); // Hard-wired?
    434         Element dc_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
     433        Element dc_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
    435434        dc_message.appendChild(dc_request);
    436435
    … …  
    517516                    // send a message to the service
    518517                    Element enrich_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    519                     Element enrich_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, enrich_service, lang, uid);
     518                    Element enrich_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, enrich_service, userContext);
    520519                    enrich_message.appendChild(enrich_request);
    521520                    // check for parameters
    … …  
    610609     * whatever the query is - should be cached
    611610     */
    612     protected boolean getBackgroundData(Element page_response, String collection, String lang, String uid)
     611    protected boolean getBackgroundData(Element page_response, String collection, UserContext userContext)
    613612    {
    614613
    … …  
    619618        String path = GSPath.appendLink(collection, "DocumentContentRetrieve");
    620619        // the format request - ignore for now, where does this request go to??
    621         Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, path, lang, uid);
     620        Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, path, userContext);
    622621        info_message.appendChild(format_request);
    623622
    … …  
    626625        if (provide_annotations)
    627626        {
    628             Element enrich_services_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", lang, uid);
     627            Element enrich_services_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", userContext);
    629628            enrich_services_request.setAttribute(GSXML.INFO_ATT, "serviceList");
    630629            info_message.appendChild(enrich_services_request);
    … …  
    659658                if (((Element) e_services.item(j)).getAttribute(GSXML.TYPE_ATT).equals("enrich"))
    660659                {
    661                     Element s = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, ((Element) e_services.item(j)).getAttribute(GSXML.NAME_ATT), lang, uid);
     660                    Element s = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, ((Element) e_services.item(j)).getAttribute(GSXML.NAME_ATT), userContext);
    662661                    enrich_message.appendChild(s);
    663662                    service_found = true;
    … …  
    711710        }
    712711        String collection = (String) params.get(GSParams.COLLECTION);
    713         String lang = request.getAttribute(GSXML.LANG_ATT);
    714         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     712        UserContext userContext = new UserContext(request);
    715713        String to = GSPath.appendLink(collection, service_name);
    716714
    717715        Element mr_query_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    718         Element mr_query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
     716        Element mr_query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
    719717        mr_query_message.appendChild(mr_query_request);
    720718
    … …  
    899897        {
    900898            //We don't want to find words inside HTML tags
    901             if(content_characters[i] == '<')
     899            if (content_characters[i] == '<')
    902900            {
    903901                inTag = true;
    … …  
    912910                continue;
    913911            }
    914            
     912
    915913            boolean is_character_letter_or_digit = Character.isLetterOrDigit(content_characters[i]);
    916            
     914
    917915            // Has a word just started?
    918916            if (in_word == false && is_character_letter_or_digit == true)

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

    r24247 r24993  
    1212// other java stuff
    1313import java.io.File;
    14 import java.util.HashMap;
    1514import java.util.*;
    1615import java.io.StringReader;
    … …  
    4645   
    4746        String subaction = request.getAttribute(GSXML.SUBACTION_ATT);
    48         String lang = request.getAttribute(GSXML.LANG_ATT);
    49         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     47        UserContext userContext = new UserContext(request);
    5048        // get the param list
    5149        Element cgi_param_list = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    … …  
    6462
    6563        Element mr_request_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    66         Element mr_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT_STRING, to, lang, uid);
     64        Element mr_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT_STRING, to, userContext);
    6765
    6866        mr_request.setAttribute("service", service);

  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/GS2BrowseAction.java

    r24990 r24993  
    5858        }
    5959
    60         String lang = request.getAttribute(GSXML.LANG_ATT);
    61         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     60        UserContext userContext = new UserContext(request);
    6261        String to = GSPath.appendLink(collection, service_name);
    6362
    … …  
    6766
    6867        Element info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    69         Element info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang, uid);
     68        Element info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, userContext);
    7069        info_message.appendChild(info_request);
    7170
    7271        // also get the format stuff now if there is some
    73         Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, to, lang, uid);
     72        Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, to, userContext);
    7473        info_message.appendChild(format_request);
    7574        // process the requests
    … …  
    8685
    8786        //append site metadata
    88         addSiteMetadata(page_response, lang, uid);
     87        addSiteMetadata(page_response, userContext);
    8988
    9089        // if rt=d, then we are just displaying the service
    … …  
    154153        // get the browse structure for the selected node
    155154        Element classify_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    156         Element classify_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
     155        Element classify_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
    157156        classify_message.appendChild(classify_request);
    158157
    … …  
    252251        {
    253252            did_classifier = true;
    254             Element cl_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to + "MetadataRetrieve", lang, uid);
     253            Element cl_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to + "MetadataRetrieve", userContext);
    255254            metadata_message.appendChild(cl_meta_request);
    256255
    … …  
    281280        {
    282281            did_documents = true;
    283             Element doc_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, GSPath.appendLink(collection, "DocumentMetadataRetrieve"), lang, uid);
     282            Element doc_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, GSPath.appendLink(collection, "DocumentMetadataRetrieve"), userContext);
    284283            metadata_message.appendChild(doc_meta_request);
    285284

  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/GeneralAction.java

    r24866 r24993  
    2626        logger.debug(" request=" + this.converter.getString(request));
    2727
    28         String lang = request.getAttribute(GSXML.LANG_ATT);
    29         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     28        UserContext userContext = new UserContext(request);
    3029
    3130        // get the param list
    … …  
    6665
    6766            Element mr_query_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    68             Element mr_query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
     67            Element mr_query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
    6968           
    7069            if(request_type.equals("s"))
    … …  
    9190            {
    9291                // just send the reponse as is
    93                 addSiteMetadata(result_response, lang, uid);
     92                addSiteMetadata(result_response, userContext);
    9493                return result_response;
    9594            }
    … …  
    105104        // request the service info for the selected service - should be cached
    106105        Element mr_info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    107         Element mr_info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang, uid);
     106        Element mr_info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, userContext);
    108107        mr_info_message.appendChild(mr_info_request);
    109108        Element mr_info_response = (Element) this.mr.process(mr_info_message);
    … …  
    118117        }
    119118
    120         addSiteMetadata(page_response, lang, uid);
     119        addSiteMetadata(page_response, userContext);
    121120       
    122121        return result;

  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/NoCollQueryAction.java

    r24988 r24993  
    6565
    6666        String request_type = (String) params.get(GSParams.REQUEST_TYPE);
    67         String lang = request.getAttribute(GSXML.LANG_ATT);
    68         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     67        UserContext userContext = new UserContext(request);
    6968        if (request_type.equals("d"))
    7069        {
    … …  
    7271            // the only info we need to return is the collection list cos the xslt does teh rest
    7372
    74             Element coll_list = getCollectionList(lang, uid);
     73            Element coll_list = getCollectionList(userContext);
    7574            page_response.appendChild(this.doc.importNode(coll_list, true));
    7675            return page_response;
    … …  
    8988        {
    9089            logger.error("no collections were specified!");
    91             Element coll_list = getCollectionList(lang, uid);
     90            Element coll_list = getCollectionList(userContext);
    9291            page_response.appendChild(this.doc.importNode(coll_list, true));
    9392            return page_response;
    … …  
    111110        {
    112111            String to = GSPath.appendLink(colls[i], service_name);
    113             Element mr_query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
     112            Element mr_query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
    114113            mr_query_message.appendChild(mr_query_request);
    115114            mr_query_request.appendChild(query_param_list.cloneNode(true));
    … …  
    130129                String coll_name = extractCollName(((Element) responses.item(j)).getAttribute(GSXML.FROM_ATT));
    131130                String path = GSPath.appendLink(coll_name, "DocumentMetadataRetrieve");
    132                 Element mr_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, path, lang, uid);
     131                Element mr_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, path, userContext);
    133132                mr_meta_message.appendChild(mr_meta_request);
    134133                mr_meta_request.appendChild(this.doc.importNode(document_list, true));
    … …  
    182181    }
    183182
    184     protected Element getCollectionList(String lang, String uid)
     183    protected Element getCollectionList(UserContext userContext)
    185184    {
    186185
    187186        // first, get the message router info
    188187        Element coll_list_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    189         Element coll_list_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", lang, uid);
     188        Element coll_list_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", userContext);
    190189        coll_list_message.appendChild(coll_list_request);
    191190        Element coll_list_response = (Element) this.mr.process(coll_list_message);
    … …  
    209208            String name = c.getAttribute(GSXML.NAME_ATT);
    210209
    211             Element metadata_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, name, lang, uid);
     210            Element metadata_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, name, userContext);
    212211            metadata_request.appendChild(coll_param_list.cloneNode(true));
    213212            metadata_message.appendChild(metadata_request);

  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/PageAction.java

    r24989 r24993  
    6969    {
    7070
    71         String lang = request.getAttribute(GSXML.LANG_ATT);
    72         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     71        UserContext userContext = new UserContext(request);
    7372        // first, get the message router info
    7473        Element info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    75         Element coll_list_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", lang, uid);
     74        Element coll_list_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", userContext);
    7675        info_message.appendChild(coll_list_request);
    7776        Element info_response_message = (Element) this.mr.process(info_message);
    … …  
    9796            if (colls.getLength() > 0)
    9897            {
    99                 sendMultipleRequests(colls, null, GSXML.REQUEST_TYPE_DESCRIBE, lang, uid);
     98                sendMultipleRequests(colls, null, GSXML.REQUEST_TYPE_DESCRIBE, userContext);
    10099            }
    101100        }
    … …  
    108107            if (services.getLength() > 0)
    109108            {
    110                 sendMultipleRequests(services, null, GSXML.REQUEST_TYPE_DESCRIBE, lang, uid);
     109                sendMultipleRequests(services, null, GSXML.REQUEST_TYPE_DESCRIBE, userContext);
    111110            }
    112111        }
    … …  
    119118            if (clusters.getLength() > 0)
    120119            {
    121                 sendMultipleRequests(clusters, null, GSXML.REQUEST_TYPE_DESCRIBE, lang, uid);
     120                sendMultipleRequests(clusters, null, GSXML.REQUEST_TYPE_DESCRIBE, userContext);
    122121
    123122            }
    … …  
    132131    {
    133132
    134         String lang = request.getAttribute(GSXML.LANG_ATT);
    135         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     133        UserContext userContext = new UserContext(request);
    136134        // extract the params from the cgi-request,
    137135        Element cgi_paramList = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
    … …  
    144142            // return an empty response
    145143            Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
    146             addSiteMetadata(response, lang, uid);
     144            addSiteMetadata(response, userContext);
    147145            return response;
    148146        }
    … …  
    151149        Element coll_about_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    152150
    153         Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, coll_name, lang, uid);
     151        Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, coll_name, userContext);
    154152        coll_about_message.appendChild(coll_about_request);
    155153        Element coll_about_response = (Element) this.mr.process(coll_about_message);
    … …  
    196194        if (services.getLength() > 0)
    197195        {
    198             sendMultipleRequests(services, coll_name, GSXML.REQUEST_TYPE_DESCRIBE, lang, uid);
     196            sendMultipleRequests(services, coll_name, GSXML.REQUEST_TYPE_DESCRIBE, userContext);
    199197        }
    200198
    201199        Element response = (Element) GSXML.getChildByTagName(coll_about_response, GSXML.RESPONSE_ELEM);
    202200        //add the site metadata
    203         addSiteMetadata(response, lang, uid);
     201        addSiteMetadata(response, userContext);
    204202        return response;
    205203    }
    … …  
    213211    protected Element unknownPage(Element request)
    214212    {
    215 
    216         String lang = request.getAttribute(GSXML.LANG_ATT);
    217         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     213        UserContext userContext = new UserContext(request);
    218214        String page_name = request.getAttribute(GSXML.SUBACTION_ATT);
    219215
    … …  
    227223            // just return an empty response
    228224            Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
    229             addSiteMetadata(response, lang, uid);
     225            addSiteMetadata(response, userContext);
    230226            return response;
    231227        }
    … …  
    237233        Element coll_about_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    238234
    239         Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, coll_name, lang, uid);
     235        Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, coll_name, userContext);
    240236        coll_about_message.appendChild(coll_about_request);
    241237
    … …  
    245241
    246242        //add the site metadata
    247         addSiteMetadata(response, lang, uid);
     243        addSiteMetadata(response, userContext);
    248244
    249245        return response;
    … …  
    251247    }
    252248
    253     protected boolean sendMultipleRequests(NodeList items, String path_prefix, String request_type, String lang, String uid)
     249    protected boolean sendMultipleRequests(NodeList items, String path_prefix, String request_type, UserContext userContext)
    254250    {
    255251
    … …  
    264260                path = GSPath.appendLink(path_prefix, path);
    265261            }
    266             Element request = GSXML.createBasicRequest(this.doc, request_type, path, lang, uid);
     262            Element request = GSXML.createBasicRequest(this.doc, request_type, path, userContext);
    267263            message.appendChild(request);
    268264        }

  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/ProcessAction.java

    r24991 r24993  
    4343        }
    4444        String request_type = (String) params.get(GSParams.REQUEST_TYPE);
    45         String lang = request.getAttribute(GSXML.LANG_ATT);
    46         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     45        UserContext userContext = new UserContext(request);
    4746        // what is carried out depends on the request_type
    4847        // if rt=d, then a describe request is done,
    … …  
    9493
    9594            }
    96             Element mr_query_request = GSXML.createBasicRequest(this.doc, request_type_att, to, lang, uid);
     95            Element mr_query_request = GSXML.createBasicRequest(this.doc, request_type_att, to, userContext);
    9796            if (param_list != null)
    9897            {
    … …  
    119118        // request the service info for the selected service - should be cached
    120119        Element mr_info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    121         Element mr_info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang, uid);
     120        Element mr_info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, userContext);
    122121        mr_info_message.appendChild(mr_info_request);
    123122        Element mr_info_response = (Element) this.mr.process(mr_info_message);

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

    r24987 r24993  
    6868        }
    6969
    70         String lang = request.getAttribute(GSXML.LANG_ATT);
    71         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     70        UserContext userContext = new UserContext(request);
    7271        String to = service_name;
    7372        if (collection != null)
    … …  
    8079            // we have been asked for the service description
    8180            Element mr_info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    82             Element mr_info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang, uid);
     81            Element mr_info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, userContext);
    8382            mr_info_message.appendChild(mr_info_request);
    8483
    … …  
    8685            Element mr_info_response = (Element) this.mr.process(mr_info_message);
    8786            // the response
     87           
    8888            Element service_response = (Element) GSXML.getChildByTagName(mr_info_response, GSXML.RESPONSE_ELEM);
    8989
    … …  
    9696            // just a display request, no actual processing to do
    9797            //append site metadata
    98             addSiteMetadata(page_response, lang, uid);
     98            addSiteMetadata(page_response, userContext);
    9999            return page_response;
    100100        }
    … …  
    105105        { // no query
    106106            //append site metadata
    107             addSiteMetadata(page_response, lang, uid);
     107            addSiteMetadata(page_response, userContext);
    108108            return page_response;
    109109        }
    … …  
    111111        // create the query request
    112112        Element mr_query_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    113         Element mr_query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
     113        Element mr_query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
    114114        mr_query_message.appendChild(mr_query_request);
    115115
    … …  
    119119
    120120        // also get the format stuff now if there is some
    121         Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, to, lang, uid);
     121        Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, to, userContext);
    122122        mr_query_message.appendChild(format_request);
    123123
    … …  
    131131        {
    132132            //append site metadata
    133             addSiteMetadata(page_response, lang, uid);
     133            addSiteMetadata(page_response, userContext);
    134134            return page_response;
    135135        }
    … …  
    167167            page_response.appendChild(this.doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER));
    168168            //append site metadata
    169             addSiteMetadata(page_response, lang, uid);
     169            addSiteMetadata(page_response, userContext);
    170170            return page_response;
    171171        }
    … …  
    179179            page_response.appendChild(this.doc.importNode(document_list, true));
    180180            //append site metadata
    181             addSiteMetadata(page_response, lang, uid);
     181            addSiteMetadata(page_response, userContext);
    182182            return page_response;
    183183        }
    … …  
    207207            to = GSPath.prependLink(to, collection);
    208208        }
    209         Element mr_metadata_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
     209        Element mr_metadata_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
    210210        mr_metadata_message.appendChild(mr_metadata_request);
    211211
    … …  
    235235        logger.debug("Query page:\n" + this.converter.getPrettyString(page_response));
    236236        //append site metadata
    237         addSiteMetadata(page_response, lang, uid);
     237        addSiteMetadata(page_response, userContext);
    238238        return page_response;
    239239    }

  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/SystemAction.java

    r24985 r24993  
    1111// other java stuff
    1212import java.io.File;
    13 import java.util.HashMap;
    1413import java.util.*;
    1514import java.io.StringReader;
    … …  
    4645
    4746        String subaction = request.getAttribute(GSXML.SUBACTION_ATT);
    48         String lang = request.getAttribute(GSXML.LANG_ATT);
    49         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     47        UserContext userContext = new UserContext(request);
    5048        // get the param list
    5149        Element cgi_param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
    … …  
    6361
    6462        Element mr_request_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    65         Element mr_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_SYSTEM, to, lang, uid);
     63        Element mr_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_SYSTEM, to, userContext);
    6664        mr_request_message.appendChild(mr_request);
    6765

  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/XMLDocumentAction.java

    r24992 r24993  
    5252            return result;
    5353        }
    54         String lang = request.getAttribute(GSXML.LANG_ATT);
    55         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     54        UserContext userContext = new UserContext(request);
    5655
    5756        // subaction used to decide if we are returning content or structure
    … …  
    7473        Element mr_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    7574
    76         Element ret_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
     75        Element ret_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
    7776        mr_message.appendChild(ret_request);
    7877
    … …  
    8584        // also add in a request for the Title metadata
    8685        to = GSPath.appendLink(collection, "DocumentMetadataRetrieve");
    87         Element meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
     86        Element meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
    8887        // copy the doc list
    8988        meta_request.appendChild(doc_list.cloneNode(true));
Note: See TracChangeset for help on using the changeset viewer.