Changeset 6300


Ignore:
Timestamp:
2003-12-18T09:26:11+13:00 (20 years ago)
Author:
kjdon
Message:

GSXML.createBasicRequest now expects a user id

Location:
trunk/gsdl3/src/java/org/greenstone/gsdl3
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/Library2.java

    r4994 r6300  
    118118
    119119    Element xml_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    120     Element xml_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PAGE, "", "");
     120    Element xml_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PAGE, "", "", "");
    121121    xml_message.appendChild(xml_request);
    122122    Element xml_param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);

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

    r5155 r6300  
    3838    String service_name=(String)params.get(GSParams.SERVICE);
    3939    String lang = request.getAttribute(GSXML.LANG_ATT);
     40    String uid = request.getAttribute(GSXML.USER_ID_ATT);
    4041    String to=null;
    4142    if (collection==null||collection.equals("") ) {
    … …  
    5051
    5152        Element mr_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    52         Element mr_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang);
     53        Element mr_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
    5354        mr_message.appendChild(mr_request);
    5455        // just append all the params for now - should filter out unneeded ones
    … …  
    6869   
    6970    Element mr_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    70     Element applet_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang);
     71    Element applet_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang, uid);
    7172    mr_message.appendChild(applet_request);
    7273

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

    r5694 r6300  
    6666    String collection = (String) params.get(GSParams.COLLECTION);
    6767    String lang = request.getAttribute(GSXML.LANG_ATT);
     68    String uid = request.getAttribute(GSXML.USER_ID_ATT);
    6869    String document_name = (String) params.get(GSParams.DOCUMENT);
    6970    if (document_name == null || document_name.equals("")) {
    … …  
    105106    }
    106107    // get the additional data needed for the page
    107     getBackgroundData(page_response, collection, lang);
     108    getBackgroundData(page_response, collection, lang, uid);
    108109    Element format_elem = (Element)GSXML.getChildByTagName(page_response, GSXML.FORMAT_ELEM);
    109110   
    … …  
    178179        Element ds_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    179180        String to = GSPath.appendLink(collection, "DocumentStructureRetrieve");// Hard-wired?
    180         Element ds_request = GSXML.createBasicRequest(this.doc,GSXML.REQUEST_TYPE_PROCESS, to, lang);
     181        Element ds_request = GSXML.createBasicRequest(this.doc,GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
    181182        ds_message.appendChild(ds_request);
    182183        ds_request.appendChild(ds_param_list);
    … …  
    227228    Element dm_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    228229    String to = GSPath.appendLink(collection, "DocumentMetadataRetrieve");  // Hard-wired?
    229     Element dm_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang);
     230    Element dm_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
    230231    dm_message.appendChild(dm_request);
    231232    // Create a parameter list to specify the required metadata information
    … …  
    260261    // we also want a metadata request to the top level document to get
    261262    // assocfilepath - this could be cached too
    262     Element doc_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang);
     263    Element doc_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
    263264    dm_message.appendChild(doc_meta_request);
    264265    Element doc_meta_param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    … …  
    296297    Element dc_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    297298    to = GSPath.appendLink(collection, "DocumentContentRetrieve");  // Hard-wired?
    298     Element dc_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang);
     299    Element dc_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
    299300    dc_message.appendChild(dc_request);
    300301   
    … …  
    343344        // send a message to the service
    344345        Element enrich_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    345         Element enrich_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, enrich_service, lang);
     346        Element enrich_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, enrich_service, lang, uid);
    346347        enrich_message.appendChild(enrich_request);
    347348        // check for parameters
    … …  
    419420     * but is the same whatever the query is - should be cached */
    420421    protected  boolean getBackgroundData(Element page_response,
    421                      String collection, String lang) {
     422                     String collection, String lang,
     423                     String uid) {
    422424
    423425    // create a message to process - contains requests for the collection
    … …  
    427429    String path = GSPath.appendLink(collection, "DocumentContentRetrieve");
    428430    // the format request - ignore for now, where does this request go to??
    429     Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, path, lang);
     431    Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, path, lang, uid);
    430432    info_message.appendChild(format_request);
    431433
    … …  
    433435
    434436    if (provide_annotations) {
    435         Element enrich_services_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", lang);
     437        Element enrich_services_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", lang, uid);
    436438        enrich_services_request.setAttribute(GSXML.INFO_ATT, "serviceList");
    437439        info_message.appendChild(enrich_services_request);
    … …  
    462464        for (int j=0; j<e_services.getLength(); j++) {
    463465        if (((Element)e_services.item(j)).getAttribute(GSXML.TYPE_ATT).equals("enrich")) {
    464             Element s = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, ((Element)e_services.item(j)).getAttribute(GSXML.NAME_ATT), lang);
     466            Element s = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, ((Element)e_services.item(j)).getAttribute(GSXML.NAME_ATT), lang, uid);
    465467            enrich_message.appendChild(s);
    466468            service_found = true;
    … …  
    499501    String collection = (String)params.get(GSParams.COLLECTION);
    500502    String lang = request.getAttribute(GSXML.LANG_ATT);
     503    String uid = request.getAttribute(GSXML.USER_ID_ATT);
    501504    String to = GSPath.appendLink(collection, service_name);
    502505   
    503506    Element mr_query_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    504     Element mr_query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang);
     507    Element mr_query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
    505508    mr_query_message.appendChild(mr_query_request);
    506509   

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

    r6165 r6300  
    5050   
    5151    String lang = request.getAttribute(GSXML.LANG_ATT);
     52    String uid = request.getAttribute(GSXML.USER_ID_ATT);
    5253    String to = GSPath.appendLink(collection, service_name);
    5354   
    … …  
    5758   
    5859    Element info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    59     Element info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang);
     60    Element info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang, uid);
    6061    info_message.appendChild(info_request);
    6162   
    6263    // also get the format stuff now if there is some
    63     Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, to, lang);
     64    Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, to, lang, uid);
    6465    info_message.appendChild(format_request);
    6566    // process the requests

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

    r5265 r6300  
    5151    String request_type = (String)params.get(GSParams.REQUEST_TYPE);
    5252    String lang = request.getAttribute(GSXML.LANG_ATT);
     53    String uid = request.getAttribute(GSXML.USER_ID_ATT);
    5354    if (request_type.equals("d")) {
    5455        // display the query page
    5556        // the only info we need to return is the collection list cos the xslt does teh rest
    5657       
    57         Element coll_list = getCollectionList(lang);
     58        Element coll_list = getCollectionList(lang, uid);
    5859        page_response.appendChild(this.doc.importNode(coll_list, true));
    5960        return page_response;
    … …  
    7071    if (query_coll_list == null || query_coll_list.equals("")) {
    7172        System.err.println("NoCollQueryAction Error: no collections were specified!");
    72         Element coll_list = getCollectionList(lang);
     73        Element coll_list = getCollectionList(lang, uid);
    7374        page_response.appendChild(this.doc.importNode(coll_list, true));
    7475        return page_response;
    … …  
    8990    for (int i=0; i< colls.length; i++) {
    9091        String to = GSPath.appendLink(colls[i], service_name);
    91         Element mr_query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang);
     92        Element mr_query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
    9293        mr_query_message.appendChild(mr_query_request);
    9394        mr_query_request.appendChild(query_param_list.cloneNode(true));
    … …  
    107108        String coll_name = extractCollName(((Element)responses.item(j)).getAttribute(GSXML.FROM_ATT));
    108109        String path = GSPath.appendLink(coll_name, "DocumentMetadataRetrieve");
    109         Element mr_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, path, lang);
     110        Element mr_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, path, lang, uid);
    110111        mr_meta_message.appendChild(mr_meta_request);
    111112        mr_meta_request.appendChild(this.doc.importNode(document_list, true));
    … …  
    157158
    158159
    159     protected Element getCollectionList(String lang) {
     160    protected Element getCollectionList(String lang, String uid) {
    160161   
    161162    // first, get the message router info
    162163    Element coll_list_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    163     Element coll_list_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", lang);
     164    Element coll_list_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", lang, uid);
    164165    coll_list_message.appendChild(coll_list_request);
    165166    Element coll_list_response = (Element)this.mr.process(coll_list_message);
    … …  
    181182        String name = c.getAttribute(GSXML.NAME_ATT);       
    182183       
    183         Element metadata_request = GSXML.createBasicRequest(this.doc,  GSXML.REQUEST_TYPE_DESCRIBE, name, lang);
     184        Element metadata_request = GSXML.createBasicRequest(this.doc,  GSXML.REQUEST_TYPE_DESCRIBE, name, lang, uid);
    184185        metadata_request.appendChild(coll_param_list.cloneNode(true));
    185186        metadata_message.appendChild(metadata_request);

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

    r5155 r6300  
    4848   
    4949    String lang = request.getAttribute(GSXML.LANG_ATT);
    50    
     50    String uid = request.getAttribute(GSXML.USER_ID_ATT);
    5151    // first, get the message router info
    5252    Element coll_list_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    53     Element coll_list_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", lang);
     53    Element coll_list_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", lang, uid);
    5454    coll_list_message.appendChild(coll_list_request);
    5555    Element coll_list_response = (Element)this.mr.process(coll_list_message);
    … …  
    6868        String name = c.getAttribute(GSXML.NAME_ATT);       
    6969       
    70         Element metadata_request = GSXML.createBasicRequest(this.doc,  GSXML.REQUEST_TYPE_DESCRIBE, name, lang);
     70        Element metadata_request = GSXML.createBasicRequest(this.doc,  GSXML.REQUEST_TYPE_DESCRIBE, name, lang, uid);
    7171        metadata_message.appendChild(metadata_request);
    7272    }
    … …  
    103103
    104104    String lang = request.getAttribute(GSXML.LANG_ATT);
     105    String uid = request.getAttribute(GSXML.USER_ID_ATT);
    105106    // extract the params from the cgi-request,
    106107    Element cgi_paramList = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    … …  
    117118    Element coll_about_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    118119   
    119     Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE,  coll_name, lang);
     120    Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE,  coll_name, lang, uid);
    120121    coll_about_message.appendChild(coll_about_request);
    121122   
    … …  
    135136        String name = c.getAttribute(GSXML.NAME_ATT);
    136137        String address = GSPath.appendLink(coll_name, name);
    137         Element info_request = GSXML.createBasicRequest(this.doc,  GSXML.REQUEST_TYPE_DESCRIBE, address, lang);
     138        Element info_request = GSXML.createBasicRequest(this.doc,  GSXML.REQUEST_TYPE_DESCRIBE, address, lang, uid);
    138139        info_message.appendChild(info_request);
    139140    }
    … …  
    175176   
    176177    String lang = request.getAttribute(GSXML.LANG_ATT);
     178    String uid = request.getAttribute(GSXML.USER_ID_ATT);
    177179    String page_name = request.getAttribute(GSXML.SUBACTION_ATT);
    178180
    … …  
    193195    Element coll_about_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    194196   
    195     Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE,  coll_name, lang);
     197    Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE,  coll_name, lang, uid);
    196198    coll_about_message.appendChild(coll_about_request);
    197199   

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

    r5155 r6300  
    3939    String request_type = (String) params.get(GSParams.REQUEST_TYPE);
    4040    String lang = request.getAttribute(GSXML.LANG_ATT);
     41    String uid = request.getAttribute(GSXML.USER_ID_ATT);
    4142    // what is carried out depends on the request_type
    4243    // if rt=d, then a describe request is done,
    … …  
    7576       
    7677        }
    77         Element mr_query_request = GSXML.createBasicRequest(this.doc, request_type_att, to, lang);
     78        Element mr_query_request = GSXML.createBasicRequest(this.doc, request_type_att, to, lang, uid);
    7879        if (param_list != null) {
    7980        mr_query_request.appendChild(param_list);
    … …  
    99100    // request the service info for the selected service - should be cached
    100101    Element mr_info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    101     Element mr_info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang); //.createElement(GSXML.REQUEST_ELEM);
     102    Element mr_info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang, uid); //.createElement(GSXML.REQUEST_ELEM);
    102103    mr_info_message.appendChild(mr_info_request);
    103104    Element mr_info_response = (Element) this.mr.process(mr_info_message);

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

    r6263 r6300  
    5757   
    5858    String lang = request.getAttribute(GSXML.LANG_ATT);
     59    String uid = request.getAttribute(GSXML.USER_ID_ATT);
    5960    String to = GSPath.appendLink(collection, service_name);
    6061   
    … …  
    6364    // this will probably need to be cached somehow later on.
    6465    Element mr_info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    65     Element mr_info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE,  to, lang);
     66    Element mr_info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE,  to, lang, uid);
    6667    mr_info_message.appendChild(mr_info_request);
    6768
    6869    // also get the format stuff now if there is some
    69     Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, to, lang);
     70    Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, to, lang, uid);
    7071    mr_info_message.appendChild(format_request);
    7172
    … …  
    100101    // do the query
    101102    Element mr_query_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    102     Element mr_query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang);
     103    Element mr_query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
    103104    mr_query_message.appendChild(mr_query_request);
    104105   

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

    r5155 r6300  
    2323    String subaction = request.getAttribute(GSXML.SUBACTION_ATT);
    2424    String lang = request.getAttribute(GSXML.LANG_ATT);
     25    String uid = request.getAttribute(GSXML.USER_ID_ATT);
    2526    // get the param list
    2627    Element cgi_param_list = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    … …  
    3738
    3839    Element mr_request_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    39     Element mr_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_SYSTEM, to, lang);
     40    Element mr_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_SYSTEM, to, lang, uid);
    4041    mr_request_message.appendChild(mr_request);
    4142   

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

    r5965 r6300  
    4747    }
    4848    String lang = request.getAttribute(GSXML.LANG_ATT);
     49    String uid = request.getAttribute(GSXML.USER_ID_ATT);
    4950   
    5051    // subaction used to decide if we are returning content or structure
    … …  
    6263    Element mr_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    6364   
    64     Element ret_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang);
     65    Element ret_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
    6566    mr_message.appendChild(ret_request);
    6667
    … …  
    7374    // also add in a request for the Title metadata
    7475    to = GSPath.appendLink(collection, "DocumentMetadataRetrieve");
    75     Element meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang);
     76    Element meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
    7677    // copy the doc list
    7778    meta_request.appendChild(doc_list.cloneNode(true));

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/core/DefaultReceptionist.java

    r5663 r6300  
    4040    String coll_name = coll_param.getAttribute(GSXML.VALUE_ATT);
    4141    String lang = page_request.getAttribute(GSXML.LANG_ATT);
     42    String uid = page_request.getAttribute(GSXML.USER_ID_ATT);
    4243   
    4344    boolean get_service_description = false;
    … …  
    5455        // we dont have one yet - get it
    5556        Element coll_about_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    56         Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE,  coll_name, lang);
     57        Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE,  coll_name, lang, uid);
    5758        coll_about_message.appendChild(coll_about_request);
    5859       
    … …  
    112113        String name = c.getAttribute(GSXML.NAME_ATT);
    113114        String address = GSPath.appendLink(coll_name, name);
    114         Element info_request = GSXML.createBasicRequest(this.doc,  GSXML.REQUEST_TYPE_DESCRIBE, address, lang);
     115        Element info_request = GSXML.createBasicRequest(this.doc,  GSXML.REQUEST_TYPE_DESCRIBE, address, lang, uid);
    115116        Element req_param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    116117        req_param_list.appendChild(GSXML.createParameter(this.doc, GSXML.SUBSET_PARAM, GSXML.DISPLAY_TEXT_ELEM));

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/core/NZDLReceptionist.java

    r4995 r6300  
    5252    Element info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    5353    String to = GSPath.appendLink(collection, "ClassifierBrowse");
    54     Element info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang);
     54    Element info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang, "");
    5555    info_message.appendChild(info_request);
    5656   
Note: See TracChangeset for help on using the changeset viewer.