Changeset 5155


Ignore:
Timestamp:
2003-08-18T13:56:48+12:00 (21 years ago)
Author:
kjdon
Message:

code style consistency check - class variables no longer end in _

Location:
trunk/gsdl3/src/java/org/greenstone/gsdl3/action
Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    r4980 r5155  
    2222    protected HashMap config_params = null;
    2323    /** container Document to create XML Nodes */
    24     protected Document doc_=null;
     24    protected Document doc=null;
    2525    /** a converter class to parse XML and create Docs */
    26     protected XMLConverter converter_=null;
     26    protected XMLConverter converter=null;
    2727    /** a reference to the message router that it must talk to to
    2828     * get info. it may be a communicator acting as a proxy, but it
    2929     doesn't care about that */
    30     protected ModuleInterface mr_=null;
     30    protected ModuleInterface mr=null;
    3131
    3232    public Action() {
    33     converter_ = new XMLConverter();
    34     doc_ = converter_.newDOM();
     33    this.converter = new XMLConverter();
     34    this.doc = this.converter.newDOM();
    3535    }
    3636    /** the config variables must be set before configure is called */
    … …  
    4040    /** sets the message router */
    4141    public void setMessageRouter(ModuleInterface m) {
    42        mr_ = m;
     42       this.mr = m;
    4343    }
    4444    public void configure() {
    … …  
    5151    public String process(String xml_in) {
    5252       
    53     Element message = converter_.getDOM(xml_in).getDocumentElement();
     53    Element message = this.converter.getDOM(xml_in).getDocumentElement();
    5454   
    5555    Element result = process(message);
    56     return converter_.getString(result);
     56    return this.converter.getString(result);
    5757    }
    5858   
    … …  
    8686
    8787    protected Element createMetadataParamList(HashSet metadata_names) {
    88     Element param_list  = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     88    Element param_list  = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    8989   
    9090    Element param = null;
    … …  
    9292    while (i.hasNext()) {
    9393        String name = (String)i.next();
    94         param = doc_.createElement(GSXML.PARAM_ELEM);
     94        param = this.doc.createElement(GSXML.PARAM_ELEM);
    9595        param_list.appendChild(param);
    9696        param.setAttribute(GSXML.NAME_ATT, "metadata");
    … …  
    9898   
    9999    }
    100     System.out.println("metadata list = "+converter_.getString(param_list));
     100    System.out.println("metadata list = "+this.converter.getString(param_list));
    101101    return param_list;
    102102    }
    103 
    104103
    105104}

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

    r5147 r5155  
    1919   
    2020    Element request = (Element)GSXML.getChildByTagName(message, GSXML.REQUEST_ELEM);
    21     Element result = doc_.createElement(GSXML.MESSAGE_ELEM);
    22     Element page_response = doc_.createElement(GSXML.RESPONSE_ELEM);
     21    Element result = this.doc.createElement(GSXML.MESSAGE_ELEM);
     22    Element page_response = this.doc.createElement(GSXML.RESPONSE_ELEM);
    2323    result.appendChild(page_response);
    2424
    … …  
    4949        // we are processing stuff for the applet send a message to the service, type="query", and take out the something element, and return that as our result - the applet must take xml
    5050
    51         Element mr_message = doc_.createElement(GSXML.MESSAGE_ELEM);
    52         Element mr_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_PROCESS, to, lang);
     51        Element mr_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
     52        Element mr_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang);
    5353        mr_message.appendChild(mr_request);
    5454        // just append all the params for now - should filter out unneeded ones
    55         mr_request.appendChild(doc_.importNode(cgi_param_list, true));
     55        mr_request.appendChild(this.doc.importNode(cgi_param_list, true));
    5656       
    5757        // process the request
    58         Element mr_response = (Element)mr_.process(mr_message);
     58        Element mr_response = (Element)this.mr.process(mr_message);
    5959        // get the applet data out and pass it back as is.
    6060        String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.APPLET_DATA_ELEM);
    … …  
    6767    // get the applet description, and the collection info if a collection is specified
    6868   
    69     Element mr_message = doc_.createElement(GSXML.MESSAGE_ELEM);
    70     Element applet_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_DESCRIBE, to, lang);
     69    Element mr_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
     70    Element applet_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang);
    7171    mr_message.appendChild(applet_request);
    7272
    7373   
    74     Element mr_response = (Element)mr_.process(mr_message);
     74    Element mr_response = (Element)this.mr.process(mr_message);
    7575
    7676    // add in the applet info
    7777    String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.SERVICE_ELEM);
    7878    //path = GSPath.appendLink(path, GSXML.APPLET_ELEM);
    79     Element service_elem = (Element)doc_.importNode(GSXML.getNodeByPath(mr_response, path), true);
     79    Element service_elem = (Element)this.doc.importNode(GSXML.getNodeByPath(mr_response, path), true);
    8080    Element applet_elem = (Element)GSXML.getChildByTagName(service_elem, GSXML.APPLET_ELEM);
    8181    // must handle any params that have values that are not

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

    r5147 r5155  
    2626
    2727    // the result
    28     Element result = doc_.createElement(GSXML.MESSAGE_ELEM);
     28    Element result = this.doc.createElement(GSXML.MESSAGE_ELEM);
    2929    Element response = classifierBrowse(request);
    3030    result.appendChild(response);
    … …  
    3535    protected Element classifierBrowse(Element request) {
    3636
    37     Element page_response = doc_.createElement(GSXML.RESPONSE_ELEM);
     37    Element page_response = this.doc.createElement(GSXML.RESPONSE_ELEM);
    3838
    3939    // extract the params from the cgi-request, and check that we have a coll specified
    … …  
    6363    // this should be cached somehow later on.
    6464   
    65     Element info_message = doc_.createElement(GSXML.MESSAGE_ELEM);
    66     Element info_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_DESCRIBE, to, lang);
     65    Element info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
     66    Element info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang);
    6767    info_message.appendChild(info_request);
    6868   
    6969    // also get the format stuff now if there is some
    70     Element format_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_FORMAT, to, lang);
     70    Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, to, lang);
    7171    info_message.appendChild(format_request);
    7272    // process the requests
    7373
    74     Element info_response = (Element) mr_.process(info_message);
     74    Element info_response = (Element) this.mr.process(info_message);
    7575
    7676    // the two responses
    … …  
    8080
    8181    Element service_description = (Element)GSXML.getChildByTagName(service_response, GSXML.SERVICE_ELEM);
    82     page_response.appendChild(doc_.importNode(service_description, true));
     82    page_response.appendChild(this.doc.importNode(service_description, true));
    8383   
    8484    // if rt=d, then we are just displaying the service
    … …  
    106106        Element this_format = GSXML.getNamedElement(format_elem, GSXML.CLASSIFIER_ELEM, GSXML.NAME_ATT, top_id);
    107107        if (this_format != null) {
    108         Element new_format = GSXML.duplicateWithNewName(doc_, this_format, GSXML.FORMAT_ELEM, false);
     108        Element new_format = GSXML.duplicateWithNewName(this.doc, this_format, GSXML.FORMAT_ELEM, false);
    109109        // set teh format type
    110110        new_format.setAttribute(GSXML.TYPE_ATT, "browse");
    … …  
    115115   
    116116    // get the browse structure for the selected node
    117     Element classify_message = doc_.createElement(GSXML.MESSAGE_ELEM);
    118     Element classify_request = doc_.createElement(GSXML.REQUEST_ELEM);
     117    Element classify_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
     118    Element classify_request = this.doc.createElement(GSXML.REQUEST_ELEM);
    119119    classify_message.appendChild(classify_request);
    120120       
    … …  
    126126    //Create a parameter list to specify the required structure information
    127127    // for now, always get ancestors and children
    128     Element param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     128    Element param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    129129    classify_request.appendChild(param_list);
    130     Element param = doc_.createElement(GSXML.PARAM_ELEM);
     130    Element param = this.doc.createElement(GSXML.PARAM_ELEM);
    131131    param_list.appendChild(param);
    132132    param.setAttribute(GSXML.NAME_ATT, "structure");
    133133    param.setAttribute(GSXML.VALUE_ATT, "ancestors");
    134     param = doc_.createElement(GSXML.PARAM_ELEM);
     134    param = this.doc.createElement(GSXML.PARAM_ELEM);
    135135    param_list.appendChild(param);
    136136    param.setAttribute(GSXML.NAME_ATT, "structure");
    137137    param.setAttribute(GSXML.VALUE_ATT, "children");
    138138    if (get_siblings) {
    139         param = doc_.createElement(GSXML.PARAM_ELEM);
     139        param = this.doc.createElement(GSXML.PARAM_ELEM);
    140140        param_list.appendChild(param);
    141141        param.setAttribute(GSXML.NAME_ATT, "structure");
    … …  
    144144
    145145    // put the classifier node into a classifier node list
    146     Element classifier_list = doc_.createElement(GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER);
    147     Element classifier = doc_.createElement(GSXML.CLASS_NODE_ELEM);
     146    Element classifier_list = this.doc.createElement(GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER);
     147    Element classifier = this.doc.createElement(GSXML.CLASS_NODE_ELEM);
    148148    classifier.setAttribute(GSXML.NODE_ID_ATT, classifier_node);
    149149    classifier_list.appendChild(classifier);
    … …  
    151151       
    152152    // process the request
    153     Element classify_response = (Element)mr_.process(classify_message);
     153    Element classify_response = (Element)this.mr.process(classify_message);
    154154    // get the structure element
    155155    String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER);
    … …  
    166166   
    167167    // add the classifier node as the page classifier
    168     Element page_classifier = GSXML.duplicateWithNewName(doc_, cl_structure,  GSXML.CLASSIFIER_ELEM, true);
     168    Element page_classifier = GSXML.duplicateWithNewName(this.doc, cl_structure,  GSXML.CLASSIFIER_ELEM, true);
    169169    page_response.appendChild(page_classifier);
    170170    page_classifier.setAttribute(GSXML.NAME_ATT, top_id);
    … …  
    173173    // then for each document node
    174174
    175     Element metadata_message = doc_.createElement(GSXML.MESSAGE_ELEM);
     175    Element metadata_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    176176
    177177    boolean did_classifier = false;
    … …  
    186186    if (cl_nodes.getLength() > 0) {
    187187        did_classifier = true;
    188         Element cl_meta_request = doc_.createElement(GSXML.REQUEST_ELEM);
     188        Element cl_meta_request = this.doc.createElement(GSXML.REQUEST_ELEM);
    189189        metadata_message.appendChild(cl_meta_request);
    190190        cl_meta_request.setAttribute(GSXML.TO_ATT, to+"MetadataRetrieve");
    … …  
    192192        cl_meta_request.setAttribute(GSXML.LANG_ATT, lang);
    193193       
    194         Element new_cl_nodes_list = doc_.createElement(GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER);
     194        Element new_cl_nodes_list = this.doc.createElement(GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER);
    195195        cl_meta_request.appendChild(new_cl_nodes_list);
    196196       
    197197        for (int c=0; c<cl_nodes.getLength(); c++) {
    198198
    199         Element cl = doc_.createElement(GSXML.CLASS_NODE_ELEM);
     199        Element cl = this.doc.createElement(GSXML.CLASS_NODE_ELEM);
    200200        cl.setAttribute(GSXML.NODE_ID_ATT, ((Element)cl_nodes.item(c)).getAttribute(GSXML.NODE_ID_ATT));
    201201        new_cl_nodes_list.appendChild(cl);
    … …  
    205205        // should be based on info sent in from the recept, and the
    206206        // format stuff
    207         Element cl_param_list  = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    208         Element p = doc_.createElement(GSXML.PARAM_ELEM);
     207        Element cl_param_list  = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     208        Element p = this.doc.createElement(GSXML.PARAM_ELEM);
    209209        cl_param_list.appendChild(p);
    210210        p.setAttribute(GSXML.NAME_ATT, "metadata");
    … …  
    220220    if (doc_nodes.getLength() > 0) {
    221221        did_documents = true;
    222         Element doc_meta_request = doc_.createElement(GSXML.REQUEST_ELEM);
     222        Element doc_meta_request = this.doc.createElement(GSXML.REQUEST_ELEM);
    223223        metadata_message.appendChild(doc_meta_request);
    224224        doc_meta_request.setAttribute(GSXML.TO_ATT, GSPath.appendLink(collection, "DocumentMetadataRetrieve"));
    … …  
    226226        doc_meta_request.setAttribute(GSXML.LANG_ATT, lang);
    227227       
    228         Element doc_list = doc_.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     228        Element doc_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
    229229        doc_meta_request.appendChild(doc_list);
    230230       
    231231        for (int c=0; c<doc_nodes.getLength(); c++) {
    232232       
    233         Element d = doc_.createElement(GSXML.DOC_NODE_ELEM);
     233        Element d = this.doc.createElement(GSXML.DOC_NODE_ELEM);
    234234        d.setAttribute(GSXML.NODE_ID_ATT, ((Element)doc_nodes.item(c)).getAttribute(GSXML.NODE_ID_ATT));
    235235        doc_list.appendChild(d);
    … …  
    237237
    238238        // create and add in the param list - add all for now
    239         Element doc_param_list  = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    240         Element p = doc_.createElement(GSXML.PARAM_ELEM);
     239        Element doc_param_list  = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     240        Element p = this.doc.createElement(GSXML.PARAM_ELEM);
    241241        doc_param_list.appendChild(p);
    242242        p.setAttribute(GSXML.NAME_ATT, "metadata");
    … …  
    247247   
    248248    // process the metadata requests
    249     Element metadata_response = (Element)mr_.process(metadata_message);
     249    Element metadata_response = (Element)this.mr.process(metadata_message);
    250250    if (did_classifier) {
    251251        // the classifier one will be the first response
    … …  
    276276       
    277277
    278     System.out.println("(BrowseAction) Page:\n" + converter_.getPrettyString(page_response));
     278    System.out.println("(BrowseAction) Page:\n" + this.converter.getPrettyString(page_response));
    279279    return page_response;
    280280    }

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

    r5147 r5155  
    5555   
    5656    // the response
    57     Element result = doc_.createElement(GSXML.MESSAGE_ELEM);
    58     Element page_response = doc_.createElement(GSXML.RESPONSE_ELEM);
     57    Element result = this.doc.createElement(GSXML.MESSAGE_ELEM);
     58    Element page_response = this.doc.createElement(GSXML.RESPONSE_ELEM);
    5959    result.appendChild(page_response);
    6060
    … …  
    9393    // the_document is where all the doc info - structure and metadata etc
    9494    // is added into, to be returned in the page
    95     Element the_document = doc_.createElement(GSXML.DOCUMENT_ELEM);
     95    Element the_document = this.doc.createElement(GSXML.DOCUMENT_ELEM);
    9696    page_response.appendChild(the_document);
    9797
    … …  
    100100
    101101    // create a basic doc list containing the current node
    102     Element basic_doc_list = doc_.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
    103     Element current_doc = doc_.createElement(GSXML.DOC_NODE_ELEM);
     102    Element basic_doc_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     103    Element current_doc = this.doc.createElement(GSXML.DOC_NODE_ELEM);
    104104    basic_doc_list.appendChild(current_doc);
    105105    current_doc.setAttribute(GSXML.NODE_ID_ATT, document_name);
    106106   
    107107    // Create a parameter list to specify the required structure information
    108     Element ds_param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     108    Element ds_param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    109109
    110110    Element ds_param = null;
    … …  
    114114        get_structure_info = true;
    115115        // get teh info needed for paged naviagtion
    116         ds_param = doc_.createElement(GSXML.PARAM_ELEM);
     116        ds_param = this.doc.createElement(GSXML.PARAM_ELEM);
    117117        ds_param_list.appendChild(ds_param);
    118118        ds_param.setAttribute(GSXML.NAME_ATT, "info");
    119119        ds_param.setAttribute(GSXML.VALUE_ATT, "numSiblings");
    120         ds_param = doc_.createElement(GSXML.PARAM_ELEM);
     120        ds_param = this.doc.createElement(GSXML.PARAM_ELEM);
    121121        ds_param_list.appendChild(ds_param);
    122122        ds_param.setAttribute(GSXML.NAME_ATT, "info");
    123123        ds_param.setAttribute(GSXML.VALUE_ATT, "numChildren");
    124         ds_param = doc_.createElement(GSXML.PARAM_ELEM);
     124        ds_param = this.doc.createElement(GSXML.PARAM_ELEM);
    125125        ds_param_list.appendChild(ds_param);
    126126        ds_param.setAttribute(GSXML.NAME_ATT, "info");
    … …  
    130130        get_structure = true;
    131131        // get the info needed for table of contents
    132         ds_param = doc_.createElement(GSXML.PARAM_ELEM);
     132        ds_param = this.doc.createElement(GSXML.PARAM_ELEM);
    133133        ds_param_list.appendChild(ds_param);
    134134        ds_param.setAttribute(GSXML.NAME_ATT, "structure");
    135135        ds_param.setAttribute(GSXML.VALUE_ATT, "ancestors");
    136         ds_param = doc_.createElement(GSXML.PARAM_ELEM);
     136        ds_param = this.doc.createElement(GSXML.PARAM_ELEM);
    137137        ds_param_list.appendChild(ds_param);
    138138        ds_param.setAttribute(GSXML.NAME_ATT, "structure");
    139139        ds_param.setAttribute(GSXML.VALUE_ATT, "children");
    140140        if (get_siblings) {
    141         ds_param = doc_.createElement(GSXML.PARAM_ELEM);
     141        ds_param = this.doc.createElement(GSXML.PARAM_ELEM);
    142142        ds_param_list.appendChild(ds_param);
    143143        ds_param.setAttribute(GSXML.NAME_ATT, "structure");
    … …  
    152152
    153153        // Build a request to obtain the document structure
    154         Element ds_message = doc_.createElement(GSXML.MESSAGE_ELEM);
     154        Element ds_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    155155        String to = GSPath.appendLink(collection, "DocumentStructureRetrieve");// Hard-wired?
    156         Element ds_request = GSXML.createBasicRequest(doc_,GSXML.REQUEST_TYPE_PROCESS, to, lang);
     156        Element ds_request = GSXML.createBasicRequest(this.doc,GSXML.REQUEST_TYPE_PROCESS, to, lang);
    157157        ds_message.appendChild(ds_request);
    158158        ds_request.appendChild(ds_param_list);
    … …  
    162162       
    163163        // Process the document structure retrieve message
    164         Element ds_response_message = (Element) mr_.process(ds_message);
     164        Element ds_response_message = (Element) this.mr.process(ds_message);
    165165       
    166166        // get the info and print out
    … …  
    171171        // get the doc_node bit
    172172        if (ds_response_struct_info != null) {
    173         the_document.appendChild(doc_.importNode(ds_response_struct_info, true));
     173        the_document.appendChild(this.doc.importNode(ds_response_struct_info, true));
    174174        }
    175175        path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
    … …  
    182182        NodeList structs = ds_response_structure.getChildNodes();
    183183        for (int i=0; i<structs.getLength();i++) {
    184             the_document.appendChild(doc_.importNode(structs.item(i), true));
     184            the_document.appendChild(this.doc.importNode(structs.item(i), true));
    185185        }
    186186        } else {
    187187        // no structure nodes, so put in a dummy doc node
    188         Element doc_node = doc_.createElement(GSXML.DOC_NODE_ELEM);
     188        Element doc_node = this.doc.createElement(GSXML.DOC_NODE_ELEM);
    189189        doc_node.setAttribute(GSXML.NODE_ID_ATT, document_name);
    190190        the_document.appendChild(doc_node);
    … …  
    194194        // should think about this more
    195195        // no structure request, so just put in a dummy doc node
    196         Element doc_node = doc_.createElement(GSXML.DOC_NODE_ELEM);
     196        Element doc_node = this.doc.createElement(GSXML.DOC_NODE_ELEM);
    197197        doc_node.setAttribute(GSXML.NODE_ID_ATT, document_name);
    198198        the_document.appendChild(doc_node);
    … …  
    201201   
    202202    // Build a request to obtain some document metadata
    203     Element dm_message = doc_.createElement(GSXML.MESSAGE_ELEM);
     203    Element dm_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    204204    String to = GSPath.appendLink(collection, "DocumentMetadataRetrieve");  // Hard-wired?
    205     Element dm_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_PROCESS, to, lang);
     205    Element dm_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang);
    206206    dm_message.appendChild(dm_request);
    207207    // Create a parameter list to specify the required metadata information
    … …  
    217217   
    218218    // create the doc node list for the metadata request
    219     Element dm_doc_list = doc_.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     219    Element dm_doc_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
    220220    dm_request.appendChild(dm_doc_list);
    221221
    … …  
    227227
    228228        // Add the documentNode to the list
    229         Element dm_doc_node = doc_.createElement(GSXML.DOC_NODE_ELEM);
     229        Element dm_doc_node = this.doc.createElement(GSXML.DOC_NODE_ELEM);
    230230        dm_doc_list.appendChild(dm_doc_node);
    231231        dm_doc_node.setAttribute(GSXML.NODE_ID_ATT, doc_node_id);
    … …  
    236236    // we also want a metadata request to the top level document to get
    237237    // assocfilepath - this could be cached too
    238     Element doc_meta_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_PROCESS, to, lang);
     238    Element doc_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang);
    239239    dm_message.appendChild(doc_meta_request);
    240     Element doc_meta_param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     240    Element doc_meta_param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    241241    doc_meta_request.appendChild(doc_meta_param_list);
    242     Element doc_param = doc_.createElement(GSXML.PARAM_ELEM);
     242    Element doc_param = this.doc.createElement(GSXML.PARAM_ELEM);
    243243    doc_meta_param_list.appendChild(doc_param);
    244244    doc_param.setAttribute(GSXML.NAME_ATT, "metadata");
    … …  
    246246
    247247    // create the doc node list for the metadata request
    248     Element doc_list = doc_.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     248    Element doc_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
    249249    doc_meta_request.appendChild(doc_list);
    250250
    251     Element doc_node = doc_.createElement(GSXML.DOC_NODE_ELEM);
     251    Element doc_node = this.doc.createElement(GSXML.DOC_NODE_ELEM);
    252252    // teh node we want is the root document node
    253253    doc_node.setAttribute(GSXML.NODE_ID_ATT, document_name+".rt");
    254254    doc_list.appendChild(doc_node);
    255     Element dm_response_message = (Element) mr_.process(dm_message);
     255    Element dm_response_message = (Element) this.mr.process(dm_message);
    256256
    257257    String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
    … …  
    267267    Element doc_meta_list = (Element)GSXML.getNodeByPath(doc_meta_response, "documentNodeList/documentNode/metadataList");
    268268    if (doc_meta_list != null) {
    269         the_document.appendChild(doc_.importNode(doc_meta_list, true));
     269        the_document.appendChild(this.doc.importNode(doc_meta_list, true));
    270270    }
    271271    // Build a request to obtain some document content
    272     Element dc_message = doc_.createElement(GSXML.MESSAGE_ELEM);
     272    Element dc_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    273273    to = GSPath.appendLink(collection, "DocumentContentRetrieve");  // Hard-wired?
    274     Element dc_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_PROCESS, to, lang);
     274    Element dc_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang);
    275275    dc_message.appendChild(dc_request);
    276276   
    277277
    278278    // Create a parameter list to specify the request parameters - empty for now
    279     Element dc_param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     279    Element dc_param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    280280    dc_request.appendChild(dc_param_list);
    281281
    … …  
    283283    dc_request.appendChild(basic_doc_list);
    284284
    285     Element dc_response_message = (Element) mr_.process(dc_message);
     285    Element dc_response_message = (Element) this.mr.process(dc_message);
    286286    path = GSPath.appendLink(path, GSXML.DOC_NODE_ELEM);
    287287    Element dc_response_doc = (Element) GSXML.getNodeByPath(dc_response_message, path);
    … …  
    303303        System.out.println("enrich service is "+enrich_service);
    304304        // send a message to the service
    305         Element enrich_message = doc_.createElement(GSXML.MESSAGE_ELEM);
    306         Element enrich_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_PROCESS, enrich_service, lang);
     305        Element enrich_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
     306        Element enrich_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, enrich_service, lang);
    307307        enrich_message.appendChild(enrich_request);
    308308        // check for parameters
    309309        HashMap service_params = (HashMap)params.get("s1");
    310310        if (service_params != null) {
    311             Element enrich_pl = GSXML.createParameterList(doc_, service_params);
     311            Element enrich_pl = GSXML.createParameterList(this.doc, service_params);
    312312            enrich_request.appendChild(enrich_pl);
    313313        }
    314         Element e_doc_list = doc_.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     314        Element e_doc_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
    315315        enrich_request.appendChild(e_doc_list);
    316         e_doc_list.appendChild(doc_.importNode(dc_response_doc, true));
     316        e_doc_list.appendChild(this.doc.importNode(dc_response_doc, true));
    317317       
    318         Element enrich_response = mr_.process(enrich_message);
     318        Element enrich_response = this.mr.process(enrich_message);
    319319       
    320320        String [] links = {GSXML.RESPONSE_ELEM, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER, GSXML.DOC_NODE_ELEM, GSXML.NODE_CONTENT_ELEM};
    … …  
    333333       
    334334        dummy_node.setAttribute(GSXML.NODE_ID_ATT, modified_doc_id);
    335         dummy_node.appendChild(doc_.importNode(dc_response_doc_content, true));
     335        dummy_node.appendChild(this.doc.importNode(dc_response_doc_content, true));
    336336        // hack for simple type
    337337        if (document_type.equals("simple")) {
    … …  
    353353        String dn_id = ((Element)dn).getAttribute(GSXML.NODE_ID_ATT);
    354354        if (dn_id.equals(modified_doc_id)) {
    355             dn.appendChild(doc_.importNode(dc_response_doc_content, true));
     355            dn.appendChild(this.doc.importNode(dc_response_doc_content, true));
    356356            break;
    357357        }
    … …  
    359359    }
    360360
    361     ///ystem.out.println("(DocumentAction) Page:\n" + converter_.getPrettyString(result));
     361    ///ystem.out.println("(DocumentAction) Page:\n" + this.converter.getPrettyString(result));
    362362    return result;
    363363    }
    … …  
    383383    // description, the format element, the enrich services on offer
    384384    // these could all be cached
    385     Element info_message = doc_.createElement(GSXML.MESSAGE_ELEM);
     385    Element info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    386386    String path = GSPath.appendLink(collection, "DocumentMetadataRetrieve");
    387387    // the format request - ignore for now, where does this request go to??
    388     Element format_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_FORMAT, path, lang);
     388    Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, path, lang);
    389389    info_message.appendChild(format_request);
    390390
    … …  
    392392
    393393    if (provide_annotations) {
    394         Element enrich_services_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_DESCRIBE, "", lang);
     394        Element enrich_services_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", lang);
    395395        enrich_services_request.setAttribute(GSXML.INFO_ATT, "serviceList");
    396396        info_message.appendChild(enrich_services_request);
    397397    }
    398398   
    399     Element info_response = (Element)mr_.process(info_message);
     399    Element info_response = (Element)this.mr.process(info_message);
    400400
    401401    // the collection is the first response
    … …  
    408408        // set teh format type
    409409        format_elem.setAttribute(GSXML.TYPE_ATT, "display"); 
    410         page_response.appendChild(doc_.importNode(format_elem, true));
     410        page_response.appendChild(this.doc.importNode(format_elem, true));
    411411    }
    412412
    … …  
    415415
    416416        // a new message for the mr
    417         Element enrich_message = doc_.createElement(GSXML.MESSAGE_ELEM);
     417        Element enrich_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    418418       
    419419        NodeList e_services = services_resp.getElementsByTagName(GSXML.SERVICE_ELEM);
    … …  
    421421        for (int j=0; j<e_services.getLength(); j++) {
    422422        if (((Element)e_services.item(j)).getAttribute(GSXML.TYPE_ATT).equals("enrich")) {
    423             Element s = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_DESCRIBE, ((Element)e_services.item(j)).getAttribute(GSXML.NAME_ATT), lang);
     423            Element s = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, ((Element)e_services.item(j)).getAttribute(GSXML.NAME_ATT), lang);
    424424            enrich_message.appendChild(s);
    425425            service_found = true;
    … …  
    427427        }
    428428        if (service_found) {
    429         Element enrich_response = mr_.process(enrich_message);
     429        Element enrich_response = this.mr.process(enrich_message);
    430430
    431431        NodeList e_responses = enrich_response.getElementsByTagName(GSXML.RESPONSE_ELEM);
    432         Element service_list = doc_.createElement(GSXML.SERVICE_ELEM + GSXML.LIST_MODIFIER);
     432        Element service_list = this.doc.createElement(GSXML.SERVICE_ELEM + GSXML.LIST_MODIFIER);
    433433        for (int i=0; i<e_responses.getLength(); i++) {
    434434            Element e_resp = (Element)e_responses.item(i);
    435             Element e_service = (Element)doc_.importNode(GSXML.getChildByTagName(e_resp, GSXML.SERVICE_ELEM), true);
     435            Element e_service = (Element)this.doc.importNode(GSXML.getChildByTagName(e_resp, GSXML.SERVICE_ELEM), true);
    436436            e_service.setAttribute(GSXML.NAME_ATT, e_resp.getAttribute(GSXML.FROM_ATT));
    437437            service_list.appendChild(e_service);
    … …  
    460460    String to = GSPath.appendLink(collection, service_name);
    461461   
    462     Element mr_query_message = doc_.createElement(GSXML.MESSAGE_ELEM);
    463     Element mr_query_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_PROCESS, to, lang);
     462    Element mr_query_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
     463    Element mr_query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang);
    464464    mr_query_message.appendChild(mr_query_request);
    465465   
    466466    // paramList
    467     Element query_param_list = (Element)doc_.importNode(cgi_param_list, true);
     467    Element query_param_list = (Element)this.doc.importNode(cgi_param_list, true);
    468468    mr_query_request.appendChild(query_param_list);
    469469
    470470    // do the query
    471         Element mr_query_response = (Element)mr_.process(mr_query_message);
     471        Element mr_query_response = (Element)this.mr.process(mr_query_message);
    472472
    473473    String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.TERM_ELEM+GSXML.LIST_MODIFIER);
    … …  
    491491    }
    492492
    493     Element new_content_elem = doc_.createElement(GSXML.NODE_CONTENT_ELEM);
     493    Element new_content_elem = this.doc.createElement(GSXML.NODE_CONTENT_ELEM);
    494494
    495495    String content = GSXML.getNodeText(dc_response_doc_content);
    … …  
    509509            if (all_terms.contains(temp.toString())) {
    510510            //if there is anything already present in temp_content, add it as a text node
    511             Text t = doc_.createTextNode(temp_content.toString());
     511            Text t = this.doc.createTextNode(temp_content.toString());
    512512            new_content_elem.appendChild(t);
    513513            temp_content.delete(0, temp_content.length());
    514             Element annot = GSXML.createTextElement(doc_, "annotation", temp.toString());
     514            Element annot = GSXML.createTextElement(this.doc, "annotation", temp.toString());
    515515            annot.setAttribute("type", "query_term");
    516516            new_content_elem.appendChild(annot);
    … …  
    539539    }
    540540    // append anything left of temp_content and temp
    541     Text t = doc_.createTextNode(temp_content.toString());
     541    Text t = this.doc.createTextNode(temp_content.toString());
    542542    new_content_elem.appendChild(t);
    543543
    544544    if (temp.length() > 0) {
    545         Element annot = GSXML.createTextElement(doc_, "annotation", temp.toString());
     545        Element annot = GSXML.createTextElement(this.doc, "annotation", temp.toString());
    546546        annot.setAttribute("type", "query_term");
    547547        new_content_elem.appendChild(annot);
    548548    }
    549549    //String content_string = "<nodeContent>"+new_content.toString()+"</nodeContent>";
    550     //Element content_elem = converter_.getDOM(content_string).getDocumentElement();
     550    //Element content_elem = this.converter.getDOM(content_string).getDocumentElement();
    551551    return new_content_elem;
    552552    }

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

    r5147 r5155  
    2828
    2929    // the result
    30     Element result = doc_.createElement(GSXML.MESSAGE_ELEM);
     30    Element result = this.doc.createElement(GSXML.MESSAGE_ELEM);
    3131    Element response = classifierBrowse(request);
    3232    result.appendChild(response);
    … …  
    3737    protected Element classifierBrowse(Element request) {
    3838
    39     Element page_response = doc_.createElement(GSXML.RESPONSE_ELEM);
     39    Element page_response = this.doc.createElement(GSXML.RESPONSE_ELEM);
    4040
    4141    // extract the params from the cgi-request, and check that we have a coll specified
    … …  
    7070    // this should be cached somehow later on.
    7171   
    72     Element info_message = doc_.createElement(GSXML.MESSAGE_ELEM);
    73     Element info_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_DESCRIBE, to, lang);
     72    Element info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
     73    Element info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang);
    7474    info_message.appendChild(info_request);
    7575   
    7676    // also get the format stuff now if there is some
    77     Element format_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_FORMAT, to, lang);
     77    Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, to, lang);
    7878    info_message.appendChild(format_request);
    7979    // process the requests
    8080
    81     Element info_response = (Element) mr_.process(info_message);
     81    Element info_response = (Element) this.mr.process(info_message);
    8282
    8383    // the two responses
    … …  
    8787
    8888    Element service_description = (Element)GSXML.getChildByTagName(service_response, GSXML.SERVICE_ELEM);
    89     page_response.appendChild(doc_.importNode(service_description, true));
     89    page_response.appendChild(this.doc.importNode(service_description, true));
    9090   
    9191    // if rt=d, then we are just displaying the service
    … …  
    120120        Element this_format = GSXML.getNamedElement(format_elem, GSXML.CLASSIFIER_ELEM, GSXML.NAME_ATT, top_id);
    121121        if (this_format != null) {
    122         Element new_format = GSXML.duplicateWithNewName(doc_, this_format, GSXML.FORMAT_ELEM, false);
     122        Element new_format = GSXML.duplicateWithNewName(this.doc, this_format, GSXML.FORMAT_ELEM, false);
    123123        extractMetadataNames(new_format, doc_meta_names, class_meta_names);
    124124        // set teh format type
    … …  
    138138   
    139139    // get the browse structure for the selected node
    140     Element classify_message = doc_.createElement(GSXML.MESSAGE_ELEM);
    141     Element classify_request = doc_.createElement(GSXML.REQUEST_ELEM);
     140    Element classify_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
     141    Element classify_request = this.doc.createElement(GSXML.REQUEST_ELEM);
    142142    classify_message.appendChild(classify_request);
    143143       
    … …  
    149149    //Create a parameter list to specify the required structure information
    150150    // for now, always get ancestors and children
    151     Element param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     151    Element param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    152152    classify_request.appendChild(param_list);
    153     Element param = doc_.createElement(GSXML.PARAM_ELEM);
     153    Element param = this.doc.createElement(GSXML.PARAM_ELEM);
    154154    param_list.appendChild(param);
    155155    param.setAttribute(GSXML.NAME_ATT, "structure");
    156156    param.setAttribute(GSXML.VALUE_ATT, "ancestors");
    157     param = doc_.createElement(GSXML.PARAM_ELEM);
     157    param = this.doc.createElement(GSXML.PARAM_ELEM);
    158158    param_list.appendChild(param);
    159159    param.setAttribute(GSXML.NAME_ATT, "structure");
    160160    param.setAttribute(GSXML.VALUE_ATT, "children");
    161161//      if (get_siblings) {
    162 //          param = doc_.createElement(GSXML.PARAM_ELEM);
     162//          param = this.doc.createElement(GSXML.PARAM_ELEM);
    163163//          param_list.appendChild(param);
    164164//          param.setAttribute(GSXML.NAME_ATT, "structure");
    … …  
    167167
    168168    // put the classifier node into a classifier node list
    169     Element classifier_list = doc_.createElement(GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER);
    170     Element classifier = doc_.createElement(GSXML.CLASS_NODE_ELEM);
     169    Element classifier_list = this.doc.createElement(GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER);
     170    Element classifier = this.doc.createElement(GSXML.CLASS_NODE_ELEM);
    171171    classifier.setAttribute(GSXML.NODE_ID_ATT, classifier_node);
    172172    classifier_list.appendChild(classifier);
    … …  
    175175    if (horizontal_at_top && !classifier_node.equals(top_id)) {
    176176        // also put the top id in, to get teh persistant horizontal info
    177         classifier = doc_.createElement(GSXML.CLASS_NODE_ELEM);
     177        classifier = this.doc.createElement(GSXML.CLASS_NODE_ELEM);
    178178        classifier.setAttribute(GSXML.NODE_ID_ATT, top_id);
    179179        classifier_list.appendChild(classifier);
    … …  
    181181    }
    182182    // process the request
    183     Element classify_response = (Element)mr_.process(classify_message);
     183    Element classify_response = (Element)this.mr.process(classify_message);
    184184    System.out.println("GS2Browse: classify response***********");
    185     System.out.println(converter_.getPrettyString(classify_response));
     185    System.out.println(this.converter.getPrettyString(classify_response));
    186186    // get the structure element
    187187    //String [] links = {GSXML.MESSAGE_ELEM, GSXML.RESPONSE_ELEM, GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER};
    … …  
    211211        Element top_structure = (Element)GSXML.getNodeByPath(top_node, path);       
    212212        // add this as the classifier elem
    213         page_classifier = GSXML.duplicateWithNewName(doc_, top_structure,  GSXML.CLASSIFIER_ELEM, true);
     213        page_classifier = GSXML.duplicateWithNewName(this.doc, top_structure,  GSXML.CLASSIFIER_ELEM, true);
    214214        page_response.appendChild(page_classifier);
    215215        // now replace the child with the structure from the other request
    … …  
    219219        // find the appropriate child
    220220        Element old_classifier = GSXML.getNamedElement(page_classifier, GSXML.CLASS_NODE_ELEM, GSXML.NODE_ID_ATT, replace_name);
    221         page_classifier.replaceChild(doc_.importNode(new_classifier, true), old_classifier);
     221        page_classifier.replaceChild(this.doc.importNode(new_classifier, true), old_classifier);
    222222        page_classifier.setAttribute(GSXML.NAME_ATT, top_id);
    223223        } else {
    224224        // add the single classifier node as the page classifier
    225         page_classifier = GSXML.duplicateWithNewName(doc_, cl_structure,  GSXML.CLASSIFIER_ELEM, true);
     225        page_classifier = GSXML.duplicateWithNewName(this.doc, cl_structure,  GSXML.CLASSIFIER_ELEM, true);
    226226        page_response.appendChild(page_classifier);
    227227        page_classifier.setAttribute(GSXML.NAME_ATT, top_id);
    … …  
    230230    } else {
    231231        // add the single classifier node as the page classifier
    232         page_classifier = GSXML.duplicateWithNewName(doc_, cl_structure,  GSXML.CLASSIFIER_ELEM, true);
     232        page_classifier = GSXML.duplicateWithNewName(this.doc, cl_structure,  GSXML.CLASSIFIER_ELEM, true);
    233233        page_response.appendChild(page_classifier);
    234234        page_classifier.setAttribute(GSXML.NAME_ATT, top_id);
    … …  
    237237    // then for each document node
    238238
    239     Element metadata_message = doc_.createElement(GSXML.MESSAGE_ELEM);
     239    Element metadata_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    240240
    241241    boolean did_classifier = false;
    … …  
    250250    if (cl_nodes.getLength() > 0) {
    251251        did_classifier = true;
    252         Element cl_meta_request = doc_.createElement(GSXML.REQUEST_ELEM);
     252        Element cl_meta_request = this.doc.createElement(GSXML.REQUEST_ELEM);
    253253        metadata_message.appendChild(cl_meta_request);
    254254        cl_meta_request.setAttribute(GSXML.TO_ATT, to+"MetadataRetrieve");
    … …  
    256256        cl_meta_request.setAttribute(GSXML.LANG_ATT, lang);
    257257       
    258         Element new_cl_nodes_list = doc_.createElement(GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER);
     258        Element new_cl_nodes_list = this.doc.createElement(GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER);
    259259        cl_meta_request.appendChild(new_cl_nodes_list);
    260260       
    261261        for (int c=0; c<cl_nodes.getLength(); c++) {
    262262
    263         Element cl = doc_.createElement(GSXML.CLASS_NODE_ELEM);
     263        Element cl = this.doc.createElement(GSXML.CLASS_NODE_ELEM);
    264264        cl.setAttribute(GSXML.NODE_ID_ATT, ((Element)cl_nodes.item(c)).getAttribute(GSXML.NODE_ID_ATT));
    265265        new_cl_nodes_list.appendChild(cl);
    … …  
    280280    if (doc_nodes.getLength() > 0) {
    281281        did_documents = true;
    282         Element doc_meta_request = doc_.createElement(GSXML.REQUEST_ELEM);
     282        Element doc_meta_request = this.doc.createElement(GSXML.REQUEST_ELEM);
    283283        metadata_message.appendChild(doc_meta_request);
    284284        doc_meta_request.setAttribute(GSXML.TO_ATT, GSPath.appendLink(collection, "DocumentMetadataRetrieve"));
    … …  
    286286        doc_meta_request.setAttribute(GSXML.LANG_ATT, lang);
    287287       
    288         Element doc_list = doc_.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     288        Element doc_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
    289289        doc_meta_request.appendChild(doc_list);
    290290       
    291291        for (int c=0; c<doc_nodes.getLength(); c++) {
    292292       
    293         Element d = doc_.createElement(GSXML.DOC_NODE_ELEM);
     293        Element d = this.doc.createElement(GSXML.DOC_NODE_ELEM);
    294294        d.setAttribute(GSXML.NODE_ID_ATT, ((Element)doc_nodes.item(c)).getAttribute(GSXML.NODE_ID_ATT));
    295295        doc_list.appendChild(d);
    … …  
    303303   
    304304    // process the metadata requests
    305     Element metadata_response = (Element)mr_.process(metadata_message);
     305    Element metadata_response = (Element)this.mr.process(metadata_message);
    306306    if (did_classifier) {
    307307        // the classifier one will be the first response
    … …  
    332332       
    333333
    334     System.out.println("(GS2BrowseAction) Page:\n" + converter_.getPrettyString(page_response));
     334    System.out.println("(GS2BrowseAction) Page:\n" + this.converter.getPrettyString(page_response));
    335335    return page_response;
    336336    }

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

    r5147 r5155  
    2525        page_name = HOME_PAGE;
    2626    }
    27     Element result = doc_.createElement(GSXML.MESSAGE_ELEM);
     27    Element result = this.doc.createElement(GSXML.MESSAGE_ELEM);
    2828    Element response;
    2929    if (page_name.equals(HOME_PAGE)) {
    … …  
    3939    }
    4040   
    41     result.appendChild(doc_.importNode(response, true));
    42     ///ystem.out.println("page action result: "+converter_.getPrettyString(result));
     41    result.appendChild(this.doc.importNode(response, true));
     42    ///ystem.out.println("page action result: "+this.converter.getPrettyString(result));
    4343    return result;
    4444    }
    … …  
    5050   
    5151    // first, get the message router info
    52     Element coll_list_message = doc_.createElement(GSXML.MESSAGE_ELEM);
    53     Element coll_list_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_DESCRIBE, "", lang);
     52    Element coll_list_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
     53    Element coll_list_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", lang);
    5454    coll_list_message.appendChild(coll_list_request);
    55     Element coll_list_response = (Element)mr_.process(coll_list_message);
     55    Element coll_list_response = (Element)this.mr.process(coll_list_message);
    5656    if (coll_list_response==null) {
    5757        System.err.println("PageAction Error: couldn't query the message router!");
    … …  
    6363    NodeList colls = coll_list_response.getElementsByTagName(GSXML.COLLECTION_ELEM);
    6464    // we will send all the requests in a single message
    65     Element metadata_message = doc_.createElement(GSXML.MESSAGE_ELEM);
     65    Element metadata_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    6666    for (int i=0; i<colls.getLength(); i++) {
    6767        Element c = (Element)colls.item(i);
    6868        String name = c.getAttribute(GSXML.NAME_ATT);       
    6969       
    70         Element metadata_request = GSXML.createBasicRequest(doc_,  GSXML.REQUEST_TYPE_DESCRIBE, name, lang);
     70        Element metadata_request = GSXML.createBasicRequest(this.doc,  GSXML.REQUEST_TYPE_DESCRIBE, name, lang);
    7171        metadata_message.appendChild(metadata_request);
    7272    }
    7373
    74     Element metadata_response = (Element)mr_.process(metadata_message);
     74    Element metadata_response = (Element)this.mr.process(metadata_message);
    7575
    7676    NodeList coll_responses = metadata_response.getElementsByTagName(GSXML.RESPONSE_ELEM);
    … …  
    111111        System.err.println("PageAction Error: about page requested with no collection or cluster specified!");
    112112        // return an empty response
    113         return doc_.createElement(GSXML.RESPONSE_ELEM);
     113        return this.doc.createElement(GSXML.RESPONSE_ELEM);
    114114    }
    115115   
    116116    // get the collection or cluster description
    117     Element coll_about_message = doc_.createElement(GSXML.MESSAGE_ELEM);
    118    
    119     Element coll_about_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_DESCRIBE,  coll_name, lang);
     117    Element coll_about_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
     118   
     119    Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE,  coll_name, lang);
    120120    coll_about_message.appendChild(coll_about_request);
    121121   
    122     Element coll_about_response = (Element)mr_.process(coll_about_message);
     122    Element coll_about_response = (Element)this.mr.process(coll_about_message);
    123123
    124124    if (coll_about_response == null) {
    … …  
    130130    NodeList services = coll_about_response.getElementsByTagName(GSXML.SERVICE_ELEM);
    131131    // we will send all the requests in a single message
    132     Element info_message = doc_.createElement(GSXML.MESSAGE_ELEM);
     132    Element info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    133133    for (int i=0; i<services.getLength(); i++) {
    134134        Element c = (Element)services.item(i);
    135135        String name = c.getAttribute(GSXML.NAME_ATT);
    136136        String address = GSPath.appendLink(coll_name, name);
    137         Element info_request = GSXML.createBasicRequest(doc_,  GSXML.REQUEST_TYPE_DESCRIBE, address, lang);
     137        Element info_request = GSXML.createBasicRequest(this.doc,  GSXML.REQUEST_TYPE_DESCRIBE, address, lang);
    138138        info_message.appendChild(info_request);
    139139    }
    140140
    141     Element info_response = (Element)mr_.process(info_message);
     141    Element info_response = (Element)this.mr.process(info_message);
    142142
    143143    NodeList service_responses = info_response.getElementsByTagName(GSXML.RESPONSE_ELEM);
    … …  
    184184    if (coll_name == null || coll_name.equals("")) {
    185185        // just return an empty response
    186         return doc_.createElement(GSXML.RESPONSE_ELEM);
     186        return this.doc.createElement(GSXML.RESPONSE_ELEM);
    187187    }
    188188   
    … …  
    191191    // if there is a service specified should we get the service description instead??
    192192    // get the collection or cluster description
    193     Element coll_about_message = doc_.createElement(GSXML.MESSAGE_ELEM);
    194    
    195     Element coll_about_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_DESCRIBE,  coll_name, lang);
     193    Element coll_about_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
     194   
     195    Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE,  coll_name, lang);
    196196    coll_about_message.appendChild(coll_about_request);
    197197   
    198     Element coll_about_response = (Element)mr_.process(coll_about_message);
     198    Element coll_about_response = (Element)this.mr.process(coll_about_message);
    199199
    200200    // add the response to the page get teh response element and return it

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

    r5147 r5155  
    2020
    2121    // the result
    22     Element result = doc_.createElement(GSXML.MESSAGE_ELEM);
    23     Element page_response = doc_.createElement(GSXML.RESPONSE_ELEM);
     22    Element result = this.doc.createElement(GSXML.MESSAGE_ELEM);
     23    Element page_response = this.doc.createElement(GSXML.RESPONSE_ELEM);
    2424    result.appendChild(page_response);
    2525
    … …  
    5656        // if rt=s or rt=r, do the request
    5757       
    58         Element mr_query_message = doc_.createElement(GSXML.MESSAGE_ELEM);
     58        Element mr_query_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
    5959        String request_type_att;
    6060        Element param_list = null;
    6161        if (request_type.equals("s")) { // status
    6262        request_type_att = GSXML.REQUEST_TYPE_STATUS;
    63         param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    64         Element param = doc_.createElement(GSXML.PARAM_ELEM);
     63        param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     64        Element param = this.doc.createElement(GSXML.PARAM_ELEM);
    6565        param.setAttribute(GSXML.NAME_ATT, GSParams.PROCESS_ID);
    6666        param.setAttribute(GSXML.VALUE_ATT, (String)params.get(GSParams.PROCESS_ID));
    … …  
    7171        HashMap service_params = (HashMap)params.get("s1");
    7272        if (service_params != null) {
    73             param_list = GSXML.createParameterList(doc_, service_params);
     73            param_list = GSXML.createParameterList(this.doc, service_params);
    7474        }
    7575       
    7676        }
    77         Element mr_query_request = GSXML.createBasicRequest(doc_, request_type_att, to, lang);
     77        Element mr_query_request = GSXML.createBasicRequest(this.doc, request_type_att, to, lang);
    7878        if (param_list != null) {
    7979        mr_query_request.appendChild(param_list);
    … …  
    8181        mr_query_message.appendChild(mr_query_request);
    8282       
    83         Element mr_query_response = (Element)mr_.process(mr_query_message);
     83        Element mr_query_response = (Element)this.mr.process(mr_query_message);
    8484        Element result_response = (Element)GSXML.getChildByTagName(mr_query_response, GSXML.RESPONSE_ELEM);
    8585       
    … …  
    9191        // else append the contents of the response to the page - just the status elem for now
    9292        Element status = (Element)GSXML.getChildByTagName(result_response, GSXML.STATUS_ELEM);
    93         page_response.appendChild(doc_.importNode(status, true));
     93        page_response.appendChild(this.doc.importNode(status, true));
    9494    }
    9595   
    … …  
    9898
    9999    // request the service info for the selected service - should be cached
    100     Element mr_info_message = doc_.createElement(GSXML.MESSAGE_ELEM);
    101     Element mr_info_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_DESCRIBE, to, lang); //.createElement(GSXML.REQUEST_ELEM);
     100    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);
    102102    mr_info_message.appendChild(mr_info_request);
    103     Element mr_info_response = (Element) mr_.process(mr_info_message);
     103    Element mr_info_response = (Element) this.mr.process(mr_info_message);
    104104
    105105    String path = GSXML.RESPONSE_ELEM;
    106106    path = GSPath.appendLink(path, GSXML.SERVICE_ELEM);
    107     Element description = (Element)doc_.importNode(GSXML.getNodeByPath(mr_info_response, path), true);
     107    Element description = (Element)this.doc.importNode(GSXML.getNodeByPath(mr_info_response, path), true);
    108108
    109109    page_response.appendChild(description);
    … …  
    114114    protected Element getServiceParamList(Element cgi_param_list) {
    115115
    116     Element new_param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     116    Element new_param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    117117    Element param;
    118118    NodeList cgi_params = cgi_param_list.getChildNodes();
    … …  
    124124        }
    125125        // else add it in to the list
    126         new_param_list.appendChild(doc_.importNode(p, true));
     126        new_param_list.appendChild(this.doc.importNode(p, true));
    127127    }
    128128    return new_param_list;

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

    r5147 r5155  
    2828
    2929    // create the return message
    30     Element result = doc_.createElement(GSXML.MESSAGE_ELEM);
     30    Element result = this.doc.createElement(GSXML.MESSAGE_ELEM);
    3131    // for now we only have one type of query - subaction not used
    3232    Element response = basicQuery(request);
    33     result.appendChild(doc_.importNode(response, true));
     33    result.appendChild(this.doc.importNode(response, true));
    3434    return result;
    3535    }
    … …  
    4242   
    4343    // the result
    44     Element page_response = doc_.createElement(GSXML.RESPONSE_ELEM);
     44    Element page_response = this.doc.createElement(GSXML.RESPONSE_ELEM);
    4545   
    4646    // extract the params from the cgi-request, and check that we have a coll specified
    … …  
    6363    // for now get this again from the service.
    6464    // this will probably need to be cached somehow later on.
    65     Element mr_info_message = doc_.createElement(GSXML.MESSAGE_ELEM);
    66     Element mr_info_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_DESCRIBE,  to, lang);
     65    Element mr_info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
     66    Element mr_info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE,  to, lang);
    6767    mr_info_message.appendChild(mr_info_request);
    6868
    6969    // also get the format stuff now if there is some
    70     Element format_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_FORMAT, to, lang);
     70    Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, to, lang);
    7171    mr_info_message.appendChild(format_request);
    7272
    7373    // process the messages
    74     Element mr_info_response = (Element) mr_.process(mr_info_message);
     74    Element mr_info_response = (Element) this.mr.process(mr_info_message);
    7575   
    7676    // the two responses
    … …  
    7979    Element format_response = (Element)responses.item(1);
    8080   
    81     Element service_description = (Element)doc_.importNode(GSXML.getChildByTagName(service_response, GSXML.SERVICE_ELEM), true);
     81    Element service_description = (Element)this.doc.importNode(GSXML.getChildByTagName(service_response, GSXML.SERVICE_ELEM), true);
    8282    page_response.appendChild(service_description);
    8383   
    … …  
    9494        format_elem.setAttribute(GSXML.TYPE_ATT, "search");
    9595        // for now just add to the response
    96         page_response.appendChild(doc_.importNode(format_elem, true));
     96        page_response.appendChild(this.doc.importNode(format_elem, true));
    9797        extractMetadataNames(format_elem, metadata_names);
    9898    } else {
    … …  
    103103
    104104    // do the query
    105     Element mr_query_message = doc_.createElement(GSXML.MESSAGE_ELEM);
    106     Element mr_query_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_PROCESS, to, lang);
     105    Element mr_query_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
     106    Element mr_query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang);
    107107    mr_query_message.appendChild(mr_query_request);
    108108   
    … …  
    112112        return page_response;
    113113    }
    114     Element query_param_list = GSXML.createParameterList(doc_, service_params);//(Element)doc_.importNode(cgi_param_list, true);
    115     System.out.println("service params are "+converter_.getString(query_param_list));
     114    Element query_param_list = GSXML.createParameterList(this.doc, service_params);//(Element)this.doc.importNode(cgi_param_list, true);
     115    System.out.println("service params are "+this.converter.getString(query_param_list));
    116116    mr_query_request.appendChild(query_param_list);
    117117
    118118    // do the query
    119         Element mr_query_response = (Element)mr_.process(mr_query_message);
     119        Element mr_query_response = (Element)this.mr.process(mr_query_message);
    120120
    121121    String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
    … …  
    124124        System.err.println("QueryAction: Warning: No query result metadata.\n");
    125125    } else { // add it into the page response
    126         page_response.appendChild(doc_.importNode(query_result_metadata_list, true));
     126        page_response.appendChild(this.doc.importNode(query_result_metadata_list, true));
    127127    }
    128128   
    … …  
    132132        System.err.println("QueryAction: Warning: No query term information.\n");
    133133    } else { // add it into the page response
    134         page_response.appendChild(doc_.importNode(query_term_info_list, true));
     134        page_response.appendChild(this.doc.importNode(query_term_info_list, true));
    135135    }
    136136
    … …  
    146146   
    147147    // do the metadata request
    148     Element mr_metadata_message = doc_.createElement(GSXML.MESSAGE_ELEM);
    149     Element mr_metadata_request = doc_.createElement(GSXML.REQUEST_ELEM);
     148    Element mr_metadata_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
     149    Element mr_metadata_request = this.doc.createElement(GSXML.REQUEST_ELEM);
    150150    mr_metadata_message.appendChild(mr_metadata_request);
    151151   
    … …  
    164164   
    165165    // add in the doc node list too
    166     mr_metadata_request.appendChild(doc_.importNode(document_list, true));
    167     Element mr_metadata_response = (Element) mr_.process(mr_metadata_message); 
     166    mr_metadata_request.appendChild(this.doc.importNode(document_list, true));
     167    Element mr_metadata_response = (Element) this.mr.process(mr_metadata_message); 
    168168   
    169169    path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
    … …  
    171171
    172172    if (query_result_document_list != null) {
    173         page_response.appendChild(doc_.importNode(query_result_document_list, true));
     173        page_response.appendChild(this.doc.importNode(query_result_document_list, true));
    174174    }
    175175

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

    r5147 r5155  
    2727    HashMap params = GSXML.extractParams(cgi_param_list, false);
    2828
    29     Element result = doc_.createElement(GSXML.MESSAGE_ELEM);
     29    Element result = this.doc.createElement(GSXML.MESSAGE_ELEM);
    3030   
    3131    String coll = (String)params.get(GSParams.SYSTEM_CLUSTER);
    … …  
    3636    }
    3737
    38     Element mr_request_message = doc_.createElement(GSXML.MESSAGE_ELEM);
    39     Element mr_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_SYSTEM, to, lang);
     38    Element mr_request_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
     39    Element mr_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_SYSTEM, to, lang);
    4040    mr_request_message.appendChild(mr_request);
    4141   
    42     Element system = doc_.createElement(GSXML.SYSTEM_ELEM);
     42    Element system = this.doc.createElement(GSXML.SYSTEM_ELEM);
    4343    mr_request.appendChild(system);
    4444   
    … …  
    6565        // for now just have an error
    6666        System.err.println("SystemAction error: bad subaction type");
    67         Element page_response = doc_.createElement(GSXML.RESPONSE_ELEM);
     67        Element page_response = this.doc.createElement(GSXML.RESPONSE_ELEM);
    6868        result.appendChild(page_response);
    6969   
    … …  
    7272    }
    7373
    74     Element response_message = mr_.process(mr_request_message);
     74    Element response_message = this.mr.process(mr_request_message);
    7575   
    76     result.appendChild(GSXML.duplicateWithNewName(doc_, (Element)GSXML.getChildByTagName(response_message, GSXML.RESPONSE_ELEM), GSXML.RESPONSE_ELEM, true));
     76    result.appendChild(GSXML.duplicateWithNewName(this.doc, (Element)GSXML.getChildByTagName(response_message, GSXML.RESPONSE_ELEM), GSXML.RESPONSE_ELEM, true));
    7777    return result;
    7878   
Note: See TracChangeset for help on using the changeset viewer.