Changeset 5380 for trunk

Timestamp:

2003-09-01T09:30:53+12:00 (21 years ago)

Author:

kjdon

Message:

a few changes in the text strings

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Retrieve.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Retrieve.java

@@ -202 +202 @@
         Element cl = (Element)classifiers.item(i);
         Element new_cl = (Element)this.doc.importNode(cl, false); // just import this node, not the children
-        
+        String content = cl.getAttribute(GSXML.CLASSIFIER_CONTENT_ATT);
         cl_list.appendChild(new_cl);
         String text = GSXML.getDisplayText(cl, 
@@ -211 +211 @@
             // for now this looks in the class properties file
             // this needs to use a general metadata thing instead
-            text = getMetadataNameText(cl.getAttribute(GSXML.CLASSIFIER_CONTENT_ATT)+".buttonname", lang);
+            text = getMetadataNameText(content+".buttonname", lang);
+        }
+        if (text == null) {
+            text = content;
         }
         
@@ -218 +221 @@
 
         // description
-        String []meta_name = {getMetadataNameText(cl.getAttribute(GSXML.CLASSIFIER_CONTENT_ATT), lang)};
-        String description = getTextString("ClassifierBrowse.classifier_help", meta_name, lang);
+        
+        String meta_name = getMetadataNameText(content, lang);
+        if (meta_name==null) {
+            meta_name = content;
+        }
+        String [] array = {meta_name};
+        String description = getTextString("ClassifierBrowse.classifier_help", array, lang);
         Element cl_desc = GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_DESCRIPTION, description);
         new_cl.appendChild(cl_desc);