Changeset 30634 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractBrowse.java

Timestamp:

2016-07-28T12:58:54+12:00 (8 years ago)

Author:

kjdon

Message:

modifying the way levels, indexes, classifier buttons are displayed. displayItem with specific lang takes priority, then displayItem with a key for dictionary lookup, then if no displayItems lookup the level/index name in hte dictionary

File:

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

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

@@ -234 +234 @@
                 Element cl = (Element) classifiers.item(i);
                 Element new_cl = (Element) doc.importNode(cl, false); // just import this node, not the children
-
-                //String content = cl.getAttribute(GSXML.CLASSIFIER_CONTENT_ATT);
-
+                cl_list.appendChild(new_cl);
+
+                // have we got a displayItem for the classifier title?
+                String text = getDisplayText(cl, GSXML.DISPLAY_TEXT_NAME, lang, "en", "metadata_names");
                 //get the classify title  from the database
                 String class_id = cl.getAttribute(GSXML.NAME_ATT);
                 String content = getMetadata(class_id, "Title");
-
-                cl_list.appendChild(new_cl);
-                String text = GSXML.getDisplayText(cl, GSXML.DISPLAY_TEXT_NAME, lang, "en");
-                if (text == null || text.equals(""))
-                {
-                    // no display element was specified, use the metadata name
-                    // for now this looks in the class properties file
-                    // this needs to use a general metadata thing instead
-                    text = getMetadataNameText(content + ".buttonname", lang);
-                }
-                if (text == null)
-                {
-                    text = content;
-                }
-
+                if (text == null || text.equals("")) {
+                
+                  // no display element was specified, use the metadata name
+                  if (!content.equals("")) {
+                    
+                    text = getTextString(content + ".buttonname", lang, "metadata_names");
+                    if (text == null) {
+                      
+                      text = content;
+                    }
+                  }
+                  
+                  if (text == null) {
+                    text=class_id;
+                  }
+                }
                 Element cl_name = GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_NAME, text);
                 new_cl.appendChild(cl_name);
@@ -260 +262 @@
                 // description
 
-                String meta_name = getMetadataNameText(content, lang);
+                String meta_name = getTextString(content, lang, "metadata_names");
                 if (meta_name == null)
                 {