Changeset 30667


Ignore:
Timestamp:
08/04/16 11:41:54 (5 years ago)
Author:
kjdon
Message:

can now specify a dictionary name in a displayItem that uses a key

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ServiceRack.java

    r30647 r30667  
    458458  }
    459459
    460   public String getDisplayText(Element display, String name, String lang, String lang_default, String dictionary_name) {
     460  public String getDisplayText(Element display, String name, String lang, String lang_default, String default_dictionary) {
    461461   
    462462
     
    464464        String first = null;
    465465        String key = null;
     466        String dictionary_name = default_dictionary;
    466467        NodeList elems = display.getElementsByTagName(GSXML.DISPLAY_TEXT_ELEM);
    467468        if (elems.getLength() == 0)
     
    488489                  // a key specified. only allowed one spec with key
    489490                    key = k;
     491                    String d =  e.getAttribute(GSXML.DICTIONARY_ATT);
     492                    if (!d.equals("")) {
     493                      dictionary_name = d;
     494                    }
    490495                  }
    491496                }
Note: See TracChangeset for help on using the changeset viewer.