Changeset 7993


Ignore:
Timestamp:
2004-08-18T15:41:16+12:00 (20 years ago)
Author:
kjdon
Message:

previously changed the subset param to use DisplayItemList instead of displayItem, but forgot to change it here

Location:
trunk/gsdl3/src/java/org/greenstone/gsdl3/service
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r6695 r7993  
    8383    description.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
    8484    description.setAttribute(GSXML.NAME_ATT, service);
    85     if (subset == null || subset.equals(GSXML.DISPLAY_TEXT_ELEM)) {
     85    if (subset == null || subset.equals(GSXML.DISPLAY_TEXT_ELEM+GSXML.LIST_MODIFIER)) {
    8686        description.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME,  getTextString(service+".name", lang)));
    8787        description.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_DESCRIPTION,  getTextString(service+".description", lang)));

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

    r5126 r7993  
    124124
    125125    protected Element getServiceDescription(String service, String lang, String subset) {
    126    
    127126    if (!service.equals(TEXT_QUERY_SERVICE)) {
    128127        return null;
    … …  
    131130    tq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
    132131    tq_service.setAttribute(GSXML.NAME_ATT, TEXT_QUERY_SERVICE);
    133     if (subset==null || subset.equals(GSXML.DISPLAY_TEXT_ELEM)) {
     132    if (subset==null || subset.equals(GSXML.DISPLAY_TEXT_ELEM+GSXML.LIST_MODIFIER)) {
    134133        tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME, getTextString(TEXT_QUERY_SERVICE+".name", lang)));
    135134        tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_SUBMIT, getTextString(TEXT_QUERY_SERVICE+".submit", lang)));

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

    r7312 r7993  
    151151    tq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
    152152    tq_service.setAttribute(GSXML.NAME_ATT, TEXT_QUERY_SERVICE);
    153     if (subset==null || subset.equals(GSXML.DISPLAY_TEXT_ELEM)) {
     153    if (subset==null || subset.equals(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER)) {
    154154        tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME, getTextString(TEXT_QUERY_SERVICE+".name", lang)));
    155155        tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_SUBMIT, getTextString(TEXT_QUERY_SERVICE+".submit", lang)));

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

    r5401 r7993  
    8181        tq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
    8282        tq_service.setAttribute(GSXML.NAME_ATT, TEXT_QUERY_SERVICE);
    83         if (subset == null || subset.equals(GSXML.DISPLAY_TEXT_ELEM)) {
     83        if (subset == null || subset.equals(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER)) {
    8484        tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME, getTextString(TEXT_QUERY_SERVICE+".name", lang)));
    8585        tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_SUBMIT, getTextString(TEXT_QUERY_SERVICE+".submit", lang)));
    … …  
    177177        url_string += "&"+IM_START_PAGE_PARAM+"="+start_page;
    178178    }
    179 
    180179    String results_num = null;
    181180    String doc_ids = null;

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

    r5991 r7993  
    6666    tq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
    6767    tq_service.setAttribute(GSXML.NAME_ATT, TEXT_QUERY_SERVICE);
    68     if (subset==null || subset.equals(GSXML.DISPLAY_TEXT_ELEM)) {
     68    if (subset==null || subset.equals(GSXML.DISPLAY_TEXT_ELEM+GSXML.LIST_MODIFIER)) {
    6969        tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME, getTextString(TEXT_QUERY_SERVICE+".name", lang)));
    7070        tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_SUBMIT, getTextString(TEXT_QUERY_SERVICE+".submit", lang)));

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

    r6305 r7993  
    118118        tq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
    119119        tq_service.setAttribute(GSXML.NAME_ATT, MAP_QUERY_SERVICE);
    120         if (subset==null || subset.equals(GSXML.DISPLAY_TEXT_ELEM)) {
     120        if (subset==null || subset.equals(GSXML.DISPLAY_TEXT_ELEM+GSXML.LIST_MODIFIER)) {
    121121        tq_service.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_NAME, getTextString(MAP_QUERY_SERVICE+".name", lang)));
    122122        tq_service.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_SUBMIT, getTextString(MAP_QUERY_SERVICE+".submit", lang)));
Note: See TracChangeset for help on using the changeset viewer.