Changeset 30837 for main/trunk/greenstone3/src/java

Timestamp:

2016-09-22T12:04:07+12:00 (8 years ago)

Author:

kjdon

Message:

use the new DisplayItemUtil class instead of loca methods

File:

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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/XMLCollection.java

@@ -42 +42 @@
     if (display_list != null) {
       resolveMacros(display_list);
-        addDisplayItems(display_list);
+      DisplayItemUtil.storeDisplayItems(this.display_item_list, display_list);
     }
 
@@ -87 +87 @@
         Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
         if (param_list == null) {
-        addAllDisplayInfo(description, lang);
+          Element di_list = response_doc.createElement(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER);
+          description.appendChild(di_list);
+          DisplayItemUtil.addLanguageSpecificDisplayItems(di_list, this.display_item_list, lang, DEFAULT_LANG, this.class_loader);
+          
         description.appendChild(response_doc.importNode(this.service_list, true));
         description.appendChild(response_doc.importNode(this.metadata_list, true));
@@ -108 +111 @@
             description.appendChild(response_doc.importNode(metadata_list, true));
             } else if (info.equals(GSXML.DISPLAY_TEXT_ELEM+GSXML.LIST_MODIFIER)) {
-            addAllDisplayInfo(description, lang);
+              Element di_list = response_doc.createElement(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER);
+              description.appendChild(di_list);
+              DisplayItemUtil.addLanguageSpecificDisplayItems(di_list, this.display_item_list, lang, DEFAULT_LANG, this.class_loader);
+        
             
             } else if (info.equals(GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER)) {