Changeset 6537

Timestamp:

2004-01-16T15:55:50+13:00 (20 years ago)

Author:

jmt12

Message:

Modified so they use the new language file and refresh properly

Location:

trunk/gli/src/org/greenstone/gatherer/msm

Files:

• ElementWrapper.java (modified) (2 diffs)
• MSMUtils.java (modified) (3 diffs)
• MetadataSet.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/msm/ElementWrapper.java

@@ -230 +230 @@
 
     public String toString() {
+    return getNamespace() + MSMUtils.NS_SEP + getIdentity();
+    /*
     String element_name = getName();
     String element_identifier = getIdentity();
@@ -247 +249 @@
     //    return element_name + " (" + element_identifier + ")";
     //}
+    */
     }
 }

trunk/gli/src/org/greenstone/gatherer/msm/MSMUtils.java

@@ -314 +314 @@
     static final public Element getAttributeNodeNamed(Node element, String name) { 
     Element attribute = null;
-    String language_code = Locale.getDefault().getLanguage();
+    String language_code = Gatherer.config.getLanguage();
     for(Node n = element.getFirstChild(); n != null; n = n.getNextSibling()) {
         if(n.getNodeName().equals("Attribute")) {
@@ -382 +382 @@
         comment = StaticStrings.SPACE_CHARACTER + comment;
     }
-    String description = definition + comment;
-    return Utility.stripNL(description.trim());
+    //String description = definition + comment;
+    return definition + comment; //Utility.stripNL(description.trim());
     }
 
@@ -495 +495 @@
     String identifier = null;
     // Determine locale code.
-    String language_code = Locale.getDefault().getLanguage();
+    String language_code = Gatherer.config.getLanguage();
     // Get the 'identifier' Element with the correct locale
     for(Node node = element.getFirstChild(); node != null;

trunk/gli/src/org/greenstone/gatherer/msm/MetadataSet.java

@@ -62 +62 @@
     /** The list of metadata elements which are, of course, children of the root node. */
     private NodeList elements = null;
+
+    private String current_language_code;
     /** The description of this metadata set. Cached as it takes more computation time. */
     private String description = null;
@@ -434 +436 @@
      */
     public String getName() {
+    if(current_language_code != null && !Gatherer.config.getLanguage().equals(current_language_code)) {
+        name = null;
+    }
     if(name == null) {
         // Determine the code.
-        String language_code = Gatherer.dictionary.getLanguage();
+        current_language_code = Gatherer.config.getLanguage();
         // Recover all Name elements
         NodeList names = document.getElementsByTagName("Name");
@@ -444 +449 @@
         Element pos_name = (Element) names.item(i);
         String pos_name_code = pos_name.getAttribute("language");
-        if(pos_name_code.equalsIgnoreCase(language_code)) {
+        if(pos_name_code.equalsIgnoreCase(current_language_code)) {
             name = MSMUtils.getValue(pos_name);
             found = true;
@@ -458 +463 @@
         }
         names = null;
-        language_code = null;
-                // Failing all that set an error message
+        // Failing all that set an error message
         if(name == null) {
         name = Dictionary.get("MSM.No_Name");