Changeset 30634 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2TextSearch.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/AbstractGS2TextSearch.java (modified) (5 diffs)

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

@@ -253 +253 @@
             }
             index_ids.add(shortname);
-            String display_name = GSXML.getDisplayText(index, GSXML.DISPLAY_TEXT_NAME, lang, "en");
+            String display_name = getDisplayText(index, GSXML.DISPLAY_TEXT_NAME, lang, "en", "metadata_names");
             if (display_name.equals(""))
             {
@@ -261 +261 @@
                     display_name = shortname;
                 }
+                String d_name = getTextString(display_name+".buttonname", lang, "metadata_names");
+                if (d_name == null) {
+                  d_name = getTextString(cleanUpMetadata(display_name)+".buttonname", lang, "metadata_names");
+                }
+                if (d_name == null) {
+                  d_name = getTextString(display_name, lang, "metadata_names");
+                }
+                if (d_name != null) {
+
+                  display_name = d_name;
+                }
             }
             index_names.add(display_name);
@@ -266 +277 @@
     }
 
+  protected String cleanUpMetadata(String meta) {
+    // remove namespace, and only take the first item if there is a list of them.
+    
+    logger.error("clean up "+meta);
+    String[] parts = meta.split("[,;]");
+    String cleaned = parts[0];
+    if (cleaned.lastIndexOf('.') != -1) {
+      cleaned = cleaned.substring(cleaned.lastIndexOf('.')+1);
+    }
+    logger.error("returning "+cleaned);
+    return cleaned;
+    
+  }
     protected void getIndexSubcollectionData(ArrayList<String> index_sub_ids, ArrayList<String> index_sub_names, String lang)
     {
@@ -282 +306 @@
             }
             index_sub_ids.add(shortname);
-            String display_name = GSXML.getDisplayText(indexsub, GSXML.DISPLAY_TEXT_NAME, lang, "en");
+            String display_name = getDisplayText(indexsub, GSXML.DISPLAY_TEXT_NAME, lang, "en");
             if (display_name.equals(""))
             {
@@ -311 +335 @@
             }
             index_lang_ids.add(shortname);
-            String display_name = GSXML.getDisplayText(indexlang, GSXML.DISPLAY_TEXT_NAME, lang, "en");
+            String display_name = getDisplayText(indexlang, GSXML.DISPLAY_TEXT_NAME, lang, "en", "metadata_names");
             if (display_name.equals(""))
             {