Changeset 5147


Ignore:
Timestamp:
2003-08-18T12:37:01+12:00 (21 years ago)
Author:
kjdon
Message:

GSCGI replaced by GSParams

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

Legend:

Unmodified
Added
Removed

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

    r5115 r5147  
    2828
    2929    // request_type is display (d) or request (r)
    30     String request_type = (String)params.get(GSCGI.REQUEST_TYPE_ARG);
     30    String request_type = (String)params.get(GSParams.REQUEST_TYPE);
    3131    if (!request_type.equals("d")&&!request_type.equals("r")) {
    3232        System.err.println("AppletAction Error: the rt arg should be either d or r, instead it was "+request_type+"!");
    … …  
    3434    }
    3535   
    36     String collection = (String)params.get(GSCGI.COLLECTION_ARG);
     36    String collection = (String)params.get(GSParams.COLLECTION);
    3737    boolean coll_specified = true;
    38     String service_name=(String)params.get(GSCGI.SERVICE_ARG);
     38    String service_name=(String)params.get(GSParams.SERVICE);
    3939    String lang = request.getAttribute(GSXML.LANG_ATT);
    4040    String to=null;

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

    r4696 r5147  
    4141    HashMap params = GSXML.extractParams(cgi_paramList, false);
    4242
    43     String service_name = (String)params.get(GSCGI.SERVICE_ARG);
    44     String collection = (String)params.get(GSCGI.COLLECTION_ARG);
     43    String service_name = (String)params.get(GSParams.SERVICE);
     44    String collection = (String)params.get(GSParams.COLLECTION);
    4545    if (collection == null || collection.equals("")) {
    4646        System.err.println("BrowseAction Error:classifierBrowse, need to specify a collection!");
    … …  
    8383   
    8484    // if rt=d, then we are just displaying the service
    85     String request_type = (String)params.get(GSCGI.REQUEST_TYPE_ARG);
     85    String request_type = (String)params.get(GSParams.REQUEST_TYPE);
    8686    if (request_type.equals("d")) {
    8787        //return the page that we have so far

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

    r5116 r5147  
    6464    HashMap params = GSXML.extractParams(cgi_paramList, false);
    6565
    66     String collection = (String) params.get(GSCGI.COLLECTION_ARG);
     66    String collection = (String) params.get(GSParams.COLLECTION);
    6767    String lang = request.getAttribute(GSXML.LANG_ATT);
    68     String document_name = (String) params.get(GSCGI.DOCUMENT_ARG);
     68    String document_name = (String) params.get(GSParams.DOCUMENT);
    6969    if (document_name == null || document_name.equals("")) {
    7070        System.err.println("DocumentAction Error: no document specified!");
    … …  
    300300        if (service_selected != null && service_selected.equals("1")) {
    301301        // now we can modifiy the response doc if needed
    302         String enrich_service = (String)params.get(GSCGI.SERVICE_ARG);
     302        String enrich_service = (String)params.get(GSParams.SERVICE);
    303303        System.out.println("enrich service is "+enrich_service);
    304304        // send a message to the service
    … …  
    452452    HashMap params = GSXML.extractParams(cgi_param_list, false);
    453453   
    454     String service_name = (String)params.get(GSCGI.SERVICE_ARG);
     454    String service_name = (String)params.get(GSParams.SERVICE);
    455455    if (service_name == null || !service_name.endsWith("Query")) { // hack for now - we only do highlighting if we were in a query last - ie not if we were in a browse thingy
    456456        return dc_response_doc_content;
    457457    }
    458     String collection = (String)params.get(GSCGI.COLLECTION_ARG);
     458    String collection = (String)params.get(GSParams.COLLECTION);
    459459    String lang = request.getAttribute(GSXML.LANG_ATT);
    460460    String to = GSPath.appendLink(collection, service_name);

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

    r4855 r5147  
    4343    HashMap params = GSXML.extractParams(cgi_paramList, false);
    4444   
    45     String service_name = (String)params.get(GSCGI.SERVICE_ARG);
    46     String collection = (String)params.get(GSCGI.COLLECTION_ARG);
     45    String service_name = (String)params.get(GSParams.SERVICE);
     46    String collection = (String)params.get(GSParams.COLLECTION);
    4747    if (collection == null || collection.equals("")) {
    4848        System.err.println("GS2BrowseAction Error:classifierBrowse, need to specify a collection!");
    … …  
    9090   
    9191    // if rt=d, then we are just displaying the service
    92     String request_type = (String)params.get(GSCGI.REQUEST_TYPE_ARG);
     92    String request_type = (String)params.get(GSParams.REQUEST_TYPE);
    9393    if (request_type.equals("d")) {
    9494        //return the page that we have so far

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

    r4950 r5147  
    1616    public static final String HOME_PAGE = "home";
    1717    public static final String ABOUT_PAGE = "about";
    18 
     18    public static final String PREFS_PAGE = "pref";
    1919    public Element process (Element message) {
    2020   
    … …  
    3131    } else if (page_name.equals(ABOUT_PAGE)) {
    3232        response = aboutPage(request);
     33//      } else if (page_name.equals(PREFS_PAGE)) {
     34//          response = prefsPage(request);
    3335    } else { // unknown page
    34    
     36       
    3537        System.err.println("PageAction Error: unknown page specified!");
    3638        response =  unknownPage(request);
    3739    }
    38 
     40   
    3941    result.appendChild(doc_.importNode(response, true));
    4042    ///ystem.out.println("page action result: "+converter_.getPrettyString(result));
    … …  
    105107    HashMap params = GSXML.extractParams(cgi_paramList, false);
    106108   
    107     String coll_name = (String)params.get(GSCGI.COLLECTION_ARG);
     109    String coll_name = (String)params.get(GSParams.COLLECTION);
    108110    if (coll_name == null || coll_name.equals("")) {
    109111        System.err.println("PageAction Error: about page requested with no collection or cluster specified!");
    … …  
    164166    }
    165167
     168//      protected Element prefsPage(Element request) {
     169
     170//      return null;
     171//      }
    166172
    167173    /** if we dont know the page type, use this method */
    … …  
    175181    HashMap params = GSXML.extractParams(cgi_paramList, false);
    176182   
    177     String coll_name = (String)params.get(GSCGI.COLLECTION_ARG);
     183    String coll_name = (String)params.get(GSParams.COLLECTION);
    178184    if (coll_name == null || coll_name.equals("")) {
    179185        // just return an empty response

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

    r4981 r5147  
    3030    Element cgi_param_list = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    3131    HashMap params = GSXML.extractParams(cgi_param_list, false);
    32     String service_name = (String) params.get(GSCGI.SERVICE_ARG);
    33     String cluster_name = (String) params.get(GSCGI.CLUSTER_ARG);
    34     String response_only_p = (String)params.get(GSCGI.RESPONSE_ONLY_ARG);
     32    String service_name = (String) params.get(GSParams.SERVICE);
     33    String cluster_name = (String) params.get(GSParams.CLUSTER);
     34    String response_only_p = (String)params.get(GSParams.RESPONSE_ONLY);
    3535    boolean response_only = false;
    3636    if (response_only_p!=null) {
    3737        response_only = (response_only_p.equals("1")?true:false);
    3838    }
    39     String request_type = (String) params.get(GSCGI.REQUEST_TYPE_ARG);
     39    String request_type = (String) params.get(GSParams.REQUEST_TYPE);
    4040    String lang = request.getAttribute(GSXML.LANG_ATT);
    4141    // what is carried out depends on the request_type
    … …  
    6363        param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    6464        Element param = doc_.createElement(GSXML.PARAM_ELEM);
    65         param.setAttribute(GSXML.NAME_ATT, GSCGI.PROCESS_ID_ARG);
    66         param.setAttribute(GSXML.VALUE_ATT, (String)params.get(GSCGI.PROCESS_ID_ARG));
     65        param.setAttribute(GSXML.NAME_ATT, GSParams.PROCESS_ID);
     66        param.setAttribute(GSXML.VALUE_ATT, (String)params.get(GSParams.PROCESS_ID));
    6767        param_list.appendChild(param);
    6868        } else {
    … …  
    120120        Element p = (Element) cgi_params.item(i);
    121121        String name = p.getAttribute(GSXML.NAME_ATT);
    122         if (name.equals(GSCGI.SERVICE_ARG) || name.equals(GSCGI.REQUEST_TYPE_ARG) || name.equals(GSCGI.CLUSTER_ARG)) {
     122        if (name.equals(GSParams.SERVICE) || name.equals(GSParams.REQUEST_TYPE) || name.equals(GSParams.CLUSTER)) {
    123123        continue;
    124124        }

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

    r5117 r5147  
    4848    HashMap params = GSXML.extractParams(cgi_param_list, false);
    4949   
    50     String request_type = (String)params.get(GSCGI.REQUEST_TYPE_ARG);
    51     String service_name = (String)params.get(GSCGI.SERVICE_ARG);
    52     String collection = (String)params.get(GSCGI.COLLECTION_ARG);
     50    String request_type = (String)params.get(GSParams.REQUEST_TYPE);
     51    String service_name = (String)params.get(GSParams.SERVICE);
     52    String collection = (String)params.get(GSParams.COLLECTION);
    5353   
    5454    if (collection == null || collection.equals("")) {

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

    r4693 r5147  
    2929    Element result = doc_.createElement(GSXML.MESSAGE_ELEM);
    3030   
    31     String coll = (String)params.get(GSCGI.SYSTEM_CLUSTER_ARG);
     31    String coll = (String)params.get(GSParams.SYSTEM_CLUSTER);
    3232
    3333    String to = "";
    … …  
    4646    if (subaction.equals("c")) { // configure
    4747        system.setAttribute(GSXML.TYPE_ATT, GSXML.SYSTEM_TYPE_CONFIGURE);
    48         String info = (String)params.get(GSCGI.SYSTEM_SUBSET_ARG);
     48        String info = (String)params.get(GSParams.SYSTEM_SUBSET);
    4949        system.setAttribute(GSXML.SYSTEM_SUBSET_ATT, info);
    5050   
    5151    } else {
    52         String name = (String)params.get(GSCGI.SYSTEM_MODULE_NAME_ARG);
    53         String type = (String)params.get(GSCGI.SYSTEM_MODULE_TYPE_ARG);
     52        String name = (String)params.get(GSParams.SYSTEM_MODULE_NAME);
     53        String type = (String)params.get(GSParams.SYSTEM_MODULE_TYPE);
    5454
    5555        system.setAttribute(GSXML.SYSTEM_MODULE_NAME_ATT, name);

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

    r5126 r5147  
    6161    private static final String CREATOR_PARAM = "creator";
    6262    private static final String NEW_FILE_PARAM = "newfile";
    63     private static final String PROCESS_ID_PARAM = GSCGI.PROCESS_ID_ARG;
     63    private static final String PROCESS_ID_PARAM = GSParams.PROCESS_ID;
    6464    private static final String BUILDTYPE_PARAM = "buildType";
    6565    private static final String BUILDTYPE_MG = "mg";

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Retrieve.java

    r5126 r5147  
    211211            // for now this looks in the class properties file
    212212            // this needs to use a general metadata thing instead
    213             text = getTextString(cl.getAttribute(GSXML.CLASSIFIER_CONTENT_ATT), lang);
     213            text = getTextString("metadata."+cl.getAttribute(GSXML.CLASSIFIER_CONTENT_ATT), lang);
    214214        }
    215215       
    … …  
    462462    result.setAttribute(GSXML.FROM_ATT, service_name);
    463463    result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
     464
     465
     466    Element query_doc_list = (Element) GSXML.getChildByTagName(request, node_name+GSXML.LIST_MODIFIER);
     467    if (query_doc_list == null) {
     468        System.err.println("Error: DocumentStructureRetrieve request specified no doc nodes.\n");
     469        return result;
     470    }
    464471
    465472    // Get the parameters of the request
    … …  
    519526   
    520527   
    521     Element query_doc_list = (Element) GSXML.getChildByTagName(request, node_name+GSXML.LIST_MODIFIER);
    522     if (query_doc_list == null) {
    523         System.err.println("Error: DocumentStructureRetrieve request specified no doc nodes.\n");
    524         return result;
    525     }
    526528   
    527529    Element doc_list = this.doc.createElement(node_name+GSXML.LIST_MODIFIER);

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/service/PhindPhraseBrowse.java

    r5126 r5147  
    8383    // phindcgi param now is not complete - library must be prepended to it.
    8484    String app_info = "<"+GSXML.APPLET_ELEM+" CODEBASE='lib/java' CODE='org.greenstone.applet.phind.Phind.class' ARCHIVE='phind.jar, xercesImpl.jar, gsdl3.jar, jaxp.jar, xml-apis.jar' WIDTH='500' HEIGHT='400'><PARAM NAME='library' VALUE=''/> <PARAM NAME='phindcgi' VALUE='?";
    85     app_info += GSCGI.ACTION_ARG +"=a&amp;"+GSCGI.REQUEST_TYPE_ARG +"=r&amp;"+GSCGI.SERVICE_ARG+"="+PHIND_SERVICE+"&amp;"+GSCGI.OUTPUT_ARG+"=xml&amp;"+GSCGI.RESPONSE_ONLY_ARG+"=1'/>";
     85    app_info += GSParams.ACTION +"=a&amp;"+GSParams.REQUEST_TYPE +"=r&amp;"+GSParams.SERVICE+"="+PHIND_SERVICE+"&amp;"+GSParams.OUTPUT+"=xml&amp;"+GSParams.RESPONSE_ONLY+"=1'/>";
    8686    app_info +="<PARAM NAME='collection'   VALUE='";
    8787    app_info += this.cluster_name;
Note: See TracChangeset for help on using the changeset viewer.