Changeset 28964 for main


Ignore:
Timestamp:
2014-04-10T14:34:47+12:00 (10 years ago)
Author:
kjdon
Message:

nodeToElement now in GSXML. Some param changes for a few GSXML methods

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

Legend:

Unmodified
Added
Removed

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

    r28382 r28964  
    249249        Element param_list = doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
    250250        //put them in
    251         GSXML.addParametersToList(doc, param_list, subset_params);
     251        GSXML.addParametersToList(param_list, subset_params);
    252252        metadata_request.appendChild(param_list);
    253253        //create the message
    … …  
    286286        // passed in as a parameter
    287287       
    288         Document doc = this.converter.newDOM();
     288        Document doc = XMLConverter.newDOM();
    289289       
    290290        Element mr_format_message = doc.createElement(GSXML.MESSAGE_ELEM);

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

    r28382 r28964  
    2424    {
    2525
    26         Element message = this.converter.nodeToElement(message_node);
     26        Element message = GSXML.nodeToElement(message_node);
    2727        Document doc = message.getOwnerDocument();
    2828       

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

    r28382 r28964  
    3030    public Node process(Node message_node)
    3131    {
    32         Element message = this.converter.nodeToElement(message_node);
     32        Element message = GSXML.nodeToElement(message_node);
    3333        Document doc = message.getOwnerDocument();
    3434       

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

    r28382 r28964  
    288288                {
    289289                    ex.printStackTrace();
    290                     GSXML.addError(doc, responseMessage, "Failed to copy the deposited file into the collection.");
     290                    GSXML.addError(responseMessage, "Failed to copy the deposited file into the collection.");
    291291                    return responseMessage;
    292292                }

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

    r28382 r28964  
    8181        // for now, no subaction eventually we may want to have subactions such as text assoc or something ?
    8282
    83         Element message = this.converter.nodeToElement(message_node);
     83        Element message = GSXML.nodeToElement(message_node);
    8484        Document doc = message.getOwnerDocument();
    8585       
    … …  
    212212        if (service_params != null)
    213213        {
    214             GSXML.addParametersToList(doc, ds_param_list, service_params);
     214            GSXML.addParametersToList(ds_param_list, service_params);
    215215        }
    216216
    … …  
    394394        if (service_params != null)
    395395        {
    396             GSXML.addParametersToList(doc, dm_param_list, service_params);
     396            GSXML.addParametersToList(dm_param_list, service_params);
    397397        }
    398398
    … …  
    424424        if (service_params != null)
    425425        {
    426             GSXML.addParametersToList(doc, doc_meta_param_list, service_params);
     426            GSXML.addParametersToList(doc_meta_param_list, service_params);
    427427        }
    428428
    … …  
    482482        if (service_params != null)
    483483        {
    484             GSXML.addParametersToList(doc, dc_param_list, service_params);
     484            GSXML.addParametersToList(dc_param_list, service_params);
    485485        }
    486486
    … …  
    570570                    {
    571571                        Element enrich_pl = doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
    572                         GSXML.addParametersToList(doc, enrich_pl, e_service_params);
     572                        GSXML.addParametersToList(enrich_pl, e_service_params);
    573573                        enrich_request.appendChild(enrich_pl);
    574574                    }
    … …  
    820820
    821821        Element query_param_list = doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
    822         GSXML.addParametersToList(doc, query_param_list, service_params);
     822        GSXML.addParametersToList(query_param_list, service_params);
    823823        mr_query_request.appendChild(query_param_list);
    824824

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

    r28382 r28964  
    4040    public Node process (Node message_node) {
    4141   
    42         Element message = this.converter.nodeToElement(message_node);
     42        Element message = GSXML.nodeToElement(message_node);
    4343        Document doc = message.getOwnerDocument();
    4444       

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

    r28947 r28964  
    3030    public Node process(Node message_node)
    3131    {
    32         Element message = this.converter.nodeToElement(message_node);
     32        Element message = GSXML.nodeToElement(message_node);
    3333        Document doc = message.getOwnerDocument();
    3434       

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

    r28382 r28964  
    3030    public Node process(Node message_node)
    3131    {
    32         Element message = this.converter.nodeToElement(message_node);
     32        Element message = GSXML.nodeToElement(message_node);
    3333        Document doc = message.getOwnerDocument();
    3434       
    … …  
    104104            {
    105105                param_list = doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
    106                 GSXML.addParametersToList(doc, param_list, service_params);
     106                GSXML.addParametersToList(param_list, service_params);
    107107                mr_query_request.appendChild(param_list);
    108108            }

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

    r28382 r28964  
    3737    {
    3838
    39         Element message = this.converter.nodeToElement(message_node);
     39        Element message = GSXML.nodeToElement(message_node);
    4040        Document doc = message.getOwnerDocument();
    4141       
    … …  
    103103        }
    104104        Element query_param_list = doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
    105         GSXML.addParametersToList(doc, query_param_list, service_params);
     105        GSXML.addParametersToList(query_param_list, service_params);
    106106
    107107        // we will do a query for each coll

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

    r28855 r28964  
    99import org.greenstone.gsdl3.util.GSXML;
    1010import org.greenstone.gsdl3.util.UserContext;
     11import org.greenstone.gsdl3.util.XMLConverter;
    1112import org.greenstone.util.GlobalProperties;
    1213import org.w3c.dom.Document;
    … …  
    2627    public Node process(Node message_node)
    2728    {
    28         Element message = this.converter.nodeToElement(message_node);
    29         Document doc = this.converter.newDOM();
     29        Element message = GSXML.nodeToElement(message_node);
     30        Document doc = XMLConverter.newDOM();
    3031       
    3132        Element request = (Element) GSXML.getChildByTagName(message, GSXML.REQUEST_ELEM);
    … …  
    8990  protected Element homePage(Element request)
    9091    {
    91       Document doc = this.converter.newDOM();
     92      Document doc = XMLConverter.newDOM();
    9293       
    9394        UserContext userContext = new UserContext(request);
    … …  
    154155    protected Element aboutPage(Element request)
    155156    {
    156       Document doc = this.converter.newDOM();
     157      Document doc = XMLConverter.newDOM();
    157158       
    158159        UserContext userContext = new UserContext(request);
    … …  
    238239    protected Element unknownPage(Element request)
    239240    {
    240       Document doc = this.converter.newDOM();
     241      Document doc = XMLConverter.newDOM();
    241242       
    242243        UserContext userContext = new UserContext(request);
    … …  
    326327    protected Element gli4gs3Page(Element request)
    327328    {
    328       Document doc = this.converter.newDOM();
     329      Document doc = XMLConverter.newDOM();
    329330       
    330331        String lang = request.getAttribute(GSXML.LANG_ATT);

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

    r28382 r28964  
    2121    public Node process(Node message_node)
    2222    {
    23         Element message = this.converter.nodeToElement(message_node);
     23        Element message = GSXML.nodeToElement(message_node);
    2424        Document doc = message.getOwnerDocument();
    2525       
    … …  
    9090                {
    9191                    param_list = doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
    92                     GSXML.addParametersToList(doc, param_list, service_params);
     92                    GSXML.addParametersToList(param_list, service_params);
    9393                }
    9494

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

    r28382 r28964  
    2727    public Node process(Node message_node)
    2828    {
    29         Element message = this.converter.nodeToElement(message_node);
     29        Element message = GSXML.nodeToElement(message_node);
    3030        Document doc = message.getOwnerDocument();
    3131       
    … …  
    121121
    122122        Element query_param_list = doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
    123         GSXML.addParametersToList(doc, query_param_list, service_params);
     123        GSXML.addParametersToList(query_param_list, service_params);
    124124        mr_query_request.appendChild(query_param_list);
    125125

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

    r28382 r28964  
    2727    public Node process(Node message_node)
    2828    {
    29         Element message = this.converter.nodeToElement(message_node);
     29        Element message = GSXML.nodeToElement(message_node);
    3030        Document doc = message.getOwnerDocument();
    3131       

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

    r28958 r28964  
    2929    public Node process(Node message_node)
    3030    {
    31         Element message = this.converter.nodeToElement(message_node);
     31        Element message = GSXML.nodeToElement(message_node);
    3232        Document doc = message.getOwnerDocument();
    3333       

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

    r28382 r28964  
    2828    public Node process(Node message_node)
    2929    {
    30         Element message = this.converter.nodeToElement(message_node);
     30        Element message = GSXML.nodeToElement(message_node);
    3131        Document doc = message.getOwnerDocument();
    3232       
Note: See TracChangeset for help on using the changeset viewer.