Changeset 30667

Timestamp:

2016-08-04T11:41:54+12:00 (8 years ago)

Author:

kjdon

Message:

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

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ServiceRack.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ServiceRack.java

@@ -458 +458 @@
   }
 
-  public String getDisplayText(Element display, String name, String lang, String lang_default, String dictionary_name) {
+  public String getDisplayText(Element display, String name, String lang, String lang_default, String default_dictionary) {
     
 
@@ -464 +464 @@
         String first = null;
         String key = null;
+        String dictionary_name = default_dictionary;
         NodeList elems = display.getElementsByTagName(GSXML.DISPLAY_TEXT_ELEM);
         if (elems.getLength() == 0)
@@ -488 +489 @@
                   // a key specified. only allowed one spec with key
                     key = k;
+                    String d =  e.getAttribute(GSXML.DICTIONARY_ATT);
+                    if (!d.equals("")) {
+                      dictionary_name = d;
+                    }
                   }
                 }