Changeset 38019 for main/trunk/greenstone3/src

Timestamp:

2023-09-05T10:32:59+12:00 (9 months ago)

Author:

kjdon

Message:

removing the bit where the buttonname for a classifier is used for a dictionary lookup. THis is not transparent, and hard to work out what is going on. So now, button name will be used as is. If you want dictionary lookups, use <displayItem name='name' key='Title.buttonname'/> instead

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

@@ -246 +246 @@
                   // no display element was specified, use the metadata name
                   if (!content.equals("")) {
-                    
-                    text = getTextString(content + ".buttonname", lang, "metadata_names");
-                    if (text == null) {
+                    text = content;
+                                    // text = getTextString(content + ".buttonname", lang, "metadata_names");
+                    //if (text == null) {
                       
-                      text = content;
-                    }
+                                    //text = content;
+                    //}
                   }
                   
@@ -263 +263 @@
                 // description
 
-                String meta_name = getTextString(content, lang, "metadata_names");
-                if (meta_name == null)
-                {
-                    meta_name = content;
-                }
-                String[] array = { meta_name };
+                //String meta_name = getTextString(content, lang, "metadata_names");
+                //if (meta_name == null)
+                //{
+                //  meta_name = content;
+                //}
+                                
+                //String[] array = { meta_name };
+                                String [] array = { text };
                 String description = getTextString("ClassifierBrowse.classifier_help", lang, array);
                 Element cl_desc = GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_DESCRIPTION, description);