Ignore:
Timestamp:
2003-07-11T16:29:16+12:00 (21 years ago)
Author:
kjdon
Message:

tidied up a lot of stuff, particularly the display text stuff, including how its formatted, and some of the service rack methods

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r4853 r4903  
    7777    }
    7878
    79     /** returns the service list for the subclass */
    80     protected Element getServiceList(String lang) {
    81     // for now, it is static and there is no lang stuff
    82     return short_service_info_;
    83     }
    84 
    8579    /** returns a specific service description */
    8680    protected Element getServiceDescription(String service, String lang) {
    87     Element descript = (Element)((Element)service_info_map_.get(service)).cloneNode(true);
    88     // need to add in collection param list
    89     if (!service.equals(NEW_SERVICE)) {//new doesn't need a collection list
    90         Element param_list = (Element) GSXML.getChildByTagName(descript, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    91         Element old_param = GSXML.getNamedElement(param_list, GSXML.PARAM_ELEM, GSXML.NAME_ATT, COL_PARAM);
    92         collection_list_ = getCollectionList();
    93         Element param = GSXML.createParameterDescription(doc_, COL_PARAM, GSXML.PARAM_TYPE_ENUM_SINGLE, null, collection_list_);
    94         // put at front of the list
    95         param_list.replaceChild(param, old_param);
    96     }
    97     // for now, create it on the fly - look at caching it later
    98     Element display = createServiceDisplay(service, lang);
    99     addServiceDisplay(descript, display);
    100     return descript;
    101    
    102     }
    103 
    104     /** creates a display element containing all the text strings needed to display the service page, in the language specified */
    105     protected Element createServiceDisplay(String service, String lang) {
    106     Element display = doc_.createElement(GSXML.DISPLAY_ELEM);
    107     display.appendChild(GSXML.createTextElement(doc_, GSXML.DISPLAY_NAME_ELEM,  getTextString(service+".name", lang)));
    108     display.appendChild(GSXML.createTextElement(doc_,  GSXML.DISPLAY_SUBMIT_ELEM, getTextString(service+".submit", lang)));
    109 
    110     Element param;
     81
     82    Element description = doc_.createElement(GSXML.SERVICE_ELEM);
     83    description.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
     84    description.setAttribute(GSXML.NAME_ATT, service);
     85    description.appendChild(GSXML.createDisplayTextElement(doc_, GSXML.DISPLAY_TEXT_NAME,  getTextString(service+".name", lang)));
     86    description.appendChild(GSXML.createDisplayTextElement(doc_,  GSXML.DISPLAY_TEXT_SUBMIT, getTextString(service+".submit", lang)));
     87
     88    Element param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     89    description.appendChild(param_list);
     90   
    11191    if (service.equals(NEW_SERVICE)) {
    112         // have the coll title, about, buildtype  and creator params
    113         param = GSXML.createParameterDisplay(doc_, NEW_COL_TITLE_PARAM, getTextString("param."+NEW_COL_TITLE_PARAM, lang), null, null);
    114         display.appendChild(param);
    115         param = GSXML.createParameterDisplay(doc_, CREATOR_PARAM, getTextString("param."+CREATOR_PARAM, lang), null, null);
    116         display.appendChild(param);
    117         param = GSXML.createParameterDisplay(doc_, NEW_COL_ABOUT_PARAM, getTextString("param."+NEW_COL_ABOUT_PARAM, lang), null, null);
    118         display.appendChild(param);
    119 
     92       
     93        Element param = GSXML.createParameterDescription(doc_, NEW_COL_TITLE_PARAM, getTextString("param."+NEW_COL_TITLE_PARAM, lang), GSXML.PARAM_TYPE_STRING, null, null, null);
     94        param_list.appendChild(param);
     95        param = GSXML.createParameterDescription(doc_, CREATOR_PARAM, getTextString("param."+CREATOR_PARAM, lang), GSXML.PARAM_TYPE_STRING, null, null, null);
     96        param_list.appendChild(param);
     97        param = GSXML.createParameterDescription(doc_, NEW_COL_ABOUT_PARAM, getTextString("param."+NEW_COL_ABOUT_PARAM, lang), GSXML.PARAM_TYPE_TEXT, null, null, null);
     98        param_list.appendChild(param);
    12099        String[] types = {BUILDTYPE_MGPP, BUILDTYPE_MG};
    121100        String[] type_texts = {getTextString("param."+BUILDTYPE_PARAM+"."+BUILDTYPE_MGPP, lang), getTextString("param."+BUILDTYPE_PARAM+"."+BUILDTYPE_MG, lang)};
    122         param = GSXML.createParameterDisplay(doc_, BUILDTYPE_PARAM, getTextString("param."+BUILDTYPE_PARAM, lang), types, type_texts);
    123         display.appendChild(param);
    124     } else {
    125         // have just the coll param
    126         //use the collection list already created - this method is only called directly after getServiceDescription()
    127         param = GSXML.createParameterDisplay(doc_, COL_PARAM, getTextString("param."+COL_PARAM, lang), collection_list_, collection_list_);
    128         display.appendChild(param);
    129         if (service.equals(ADD_DOC_SERVICE)) {
    130         // also have the file param
    131         param = GSXML.createParameterDisplay(doc_, NEW_FILE_PARAM, getTextString("param."+NEW_FILE_PARAM, lang), null, null);
    132         display.appendChild(param);
    133         }       
    134     }
    135 
    136     return display;
     101       
     102        param = GSXML.createParameterDescription(doc_, BUILDTYPE_PARAM, getTextString("param."+BUILDTYPE_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, BUILDTYPE_MGPP, types, type_texts);
     103        param_list.appendChild(param);
     104        return description;
     105    }
     106   
     107   
     108    if (service.equals(ACTIVATE_SERVICE) || service.equals(IMPORT_SERVICE) || service.equals(BUILD_SERVICE) || service.equals(RELOAD_SERVICE) || service.equals(DELETE_SERVICE)) {
     109       
     110        collection_list_ = getCollectionList();
     111        Element param = GSXML.createParameterDescription(doc_, COL_PARAM, getTextString("param."+COL_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, null, collection_list_, collection_list_);
     112        param_list.appendChild(param);
     113       
     114        return description;
     115    }
     116    // invalid service name
     117    return null;
    137118   
    138119    }
    … …  
    382363    short_service_info_.appendChild(e);
    383364
    384     e = doc_.createElement(GSXML.SERVICE_ELEM);
    385     e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
    386     e.setAttribute(GSXML.NAME_ATT, ADD_DOC_SERVICE);
    387     short_service_info_.appendChild(e);
    388 
    389     // set up service_info_map_
    390     // should have full details about each service incl params lists etc.
    391 
    392     Element param_list;
    393     Element param;
    394 
    395     e = doc_.createElement(GSXML.SERVICE_ELEM);
    396     e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
    397     e.setAttribute(GSXML.NAME_ATT, NEW_SERVICE);
    398     param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    399     param = GSXML.createParameterDescription(doc_, NEW_COL_TITLE_PARAM, GSXML.PARAM_TYPE_STRING, "", null);
    400     param_list.appendChild(param);
    401     param = GSXML.createParameterDescription(doc_, CREATOR_PARAM, GSXML.PARAM_TYPE_STRING, "", null);
    402     param_list.appendChild(param);
    403     param = GSXML.createParameterDescription(doc_, NEW_COL_ABOUT_PARAM, GSXML.PARAM_TYPE_TEXT, "", null);
    404     param_list.appendChild(param);
    405     String[] types = {BUILDTYPE_MGPP, BUILDTYPE_MG};
    406     param = GSXML.createParameterDescription(doc_, BUILDTYPE_PARAM, GSXML.PARAM_TYPE_ENUM_SINGLE, BUILDTYPE_MGPP, types);
    407     param_list.appendChild(param);
    408 
    409     e.appendChild(param_list);
    410     service_info_map_.put(NEW_SERVICE, e);
    411 
    412     e = doc_.createElement(GSXML.SERVICE_ELEM);
    413     e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
    414     e.setAttribute(GSXML.NAME_ATT, IMPORT_SERVICE);
    415     param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    416     param = GSXML.createParameterDescription(doc_, COL_PARAM, GSXML.PARAM_TYPE_ENUM_SINGLE, "", null);
    417     param_list.appendChild(param);
    418     e.appendChild(param_list);
    419     service_info_map_.put(IMPORT_SERVICE, e);
    420 
    421     e = doc_.createElement(GSXML.SERVICE_ELEM);
    422     e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
    423     e.setAttribute(GSXML.NAME_ATT, BUILD_SERVICE);
    424     param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    425     param = GSXML.createParameterDescription(doc_, COL_PARAM, GSXML.PARAM_TYPE_ENUM_SINGLE, "", null);
    426     param_list.appendChild(param);
    427     e.appendChild(param_list);
    428     service_info_map_.put(BUILD_SERVICE, e);
    429 
    430     e = doc_.createElement(GSXML.SERVICE_ELEM);
    431     e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
    432     e.setAttribute(GSXML.NAME_ATT, ACTIVATE_SERVICE);
    433     param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    434     param = GSXML.createParameterDescription(doc_, COL_PARAM, GSXML.PARAM_TYPE_ENUM_SINGLE, "", null);
    435     param_list.appendChild(param);
    436     e.appendChild(param_list);
    437     service_info_map_.put(ACTIVATE_SERVICE, e);
    438 
    439     e = doc_.createElement(GSXML.SERVICE_ELEM);
    440     e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
    441     e.setAttribute(GSXML.NAME_ATT, DELETE_SERVICE);
    442     param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    443     param = GSXML.createParameterDescription(doc_, COL_PARAM, GSXML.PARAM_TYPE_ENUM_SINGLE, "", null);
    444     param_list.appendChild(param);
    445     e.appendChild(param_list);
    446     service_info_map_.put(DELETE_SERVICE, e);
    447 
    448     e = doc_.createElement(GSXML.SERVICE_ELEM);
    449     e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
    450     e.setAttribute(GSXML.NAME_ATT, RELOAD_SERVICE);
    451     param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    452     param = GSXML.createParameterDescription(doc_, COL_PARAM, GSXML.PARAM_TYPE_ENUM_SINGLE, "", null);
    453     param_list.appendChild(param);
    454     e.appendChild(param_list);
    455     service_info_map_.put(RELOAD_SERVICE, e);
     365    //e = doc_.createElement(GSXML.SERVICE_ELEM);
     366    //e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
     367    //e.setAttribute(GSXML.NAME_ATT, ADD_DOC_SERVICE);
     368    //short_service_info_.appendChild(e);
    456369
    457370
Note: See TracChangeset for help on using the changeset viewer.