Changeset 6568 for trunk/gli/src/org/greenstone/gatherer/msm

Timestamp:

2004-01-21T11:21:20+13:00 (20 years ago)

Author:

jmt12

Message:

Fixed bug where legacy metadata sets were not locating the english string if one in the requested language was not found

Location:

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

Files:

• MSMUtils.java (modified) (9 diffs)
• MetadataSet.java (modified) (3 diffs)

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

@@ -446 +446 @@
     String language_code_str = Gatherer.config.getLanguage();
     StringBuffer description = new StringBuffer(StaticStrings.EMPTY_STR);
-    description.append(getElementAttribute(element, StaticStrings.DEFINITION_VALUE, language_code_str, false));
+    description.append(getElementAttribute(element, StaticStrings.DEFINITION_VALUE, language_code_str));
     if(description.length() > 0) {
         description.append(StaticStrings.SPACE_CHARACTER);
     }
-    description.append(getElementAttribute(element, StaticStrings.COMMENT_VALUE, language_code_str, false));
+    description.append(getElementAttribute(element, StaticStrings.COMMENT_VALUE, language_code_str));
     language_code_str = null;
     return description.toString();
@@ -459 +459 @@
      * @param attribute_name_str the name of the desired attribute as a String
      * @param language_code_str the two letter code String indicating the desired language
-     * @param first_match true to allow the first match to be the default value in the absence of a closer match, false for the empty string instead. This argument only has an effect when dealing with legacy metadata sets
      * @see org.greenstone.gatherer.msm.MSMUtils#getValue
      * @see org.greenstone.gatherer.msm.MSMUtils#isAttributeLanguageDependant
@@ -469 +468 @@
      * @see org.greenstone.gatherer.util.StaticStrings#NAME_ATTRIBUTE
      */
-    static public String getElementAttribute(Element element_element, String attribute_name_str, String language_code_str, boolean first_match) {
+    static public String getElementAttribute(Element element_element, String attribute_name_str, String language_code_str) {
     boolean found = false;
     String result = StaticStrings.EMPTY_STR;
+    Document document = element_element.getOwnerDocument();
     // Determine if the attribute is language specific
-    if(isAttributeLanguageDependant(element_element.getOwnerDocument(), attribute_name_str)) {
+    if(isAttributeLanguageDependant(document, attribute_name_str)) {
         NodeList language_elements = element_element.getElementsByTagName(StaticStrings.LANGUAGE_ELEMENT);
         for(int i = 0; !found && i < language_elements.getLength(); i++) {
@@ -494 +494 @@
     }
     else {
+        boolean first_match = false;
         NodeList attribute_elements = element_element.getElementsByTagName(StaticStrings.ATTRIBUTE_ELEMENT);
         for(int k = 0; !found && k < attribute_elements.getLength(); k++) {
@@ -499 +500 @@
         // We don't want to consider those attributes found inside language elements
         if(attribute_element.getParentNode() == element_element) {
+            ///ystem.err.println("First level");
             String target_name_str = attribute_element.getAttribute(StaticStrings.NAME_ATTRIBUTE);
             String target_language_str = attribute_element.getAttribute(StaticStrings.LANGUAGE_ATTRIBUTE);
+            ///ystem.err.println("Does " + target_name_str + " equal " + attribute_name_str + "?");
             if(attribute_name_str.equals(target_name_str)) {
+            ///ystem.err.println("Does " + target_language_str + " equal " + language_code_str + "?");
             if(language_code_str.equals(target_language_str)) {
+                ///ystem.err.println("Perfect match!");
                 found = true;
                 result = MSMUtils.getValue(attribute_element);
             }
-            else if(first_match) {
-                first_match = false;
-                result = MSMUtils.getValue(attribute_element);
+            else if((result == StaticStrings.EMPTY_STR || first_match) && isLegacyMDS(document)) {
+                ///ystem.err.println("Legacy MDS");
+                // Special case for old style documents, where the english match is good enough
+                if(target_language_str.equals(StaticStrings.ENGLISH_LANGUAGE_STR)) {
+                ///ystem.err.println("English plate.");
+                result = MSMUtils.getValue(attribute_element);
+                }
+                // Super special case where the first match is better than nothing
+                else if(result == StaticStrings.EMPTY_STR && !first_match) {
+                ///ystem.err.println("First match.");
+                first_match = true;
+                result = MSMUtils.getValue(attribute_element);
+                }
             }
             }
@@ -514 +529 @@
             target_name_str = null;
         }
+        //else {
+        ///ystem.err.println("Second level");
+        //}
         attribute_element = null;
         }
@@ -519 +537 @@
 
     }
+    document = null;
     return result;
     }
@@ -578 +597 @@
      */
     static final public String getIdentifier(Element element) {
-    String identifier = getElementAttribute(element, StaticStrings.IDENTIFIER_VALUE, Gatherer.config.getLanguage(), false);
+    String identifier = getElementAttribute(element, StaticStrings.IDENTIFIER_VALUE, Gatherer.config.getLanguage());
     // Failing the above we return the nodes name instead.
     if(identifier == null || identifier.length() == 0) {
@@ -745 +764 @@
     String language_specific_attributes = document.getDocumentElement().getAttribute(StaticStrings.LANGUAGEDEPENDANT_ATTRIBUTE).toLowerCase();
     return language_specific_attributes.indexOf(attribute_name_str) != -1;
+    }
+
+    /** Determine if the given document is a legacy MDS or a new multilingual one. The easiest way to tell is whether there is a language_dependant attribute in the document element.
+     * @param document the Document to test
+     * @return true if this is an old mds, false otherwise
+     * @see org.greenstone.gatherer.util.StaticStrings#LANGUAGEDEPENDANT_ATTRIBUTE
+     * @see org.greenstone.gatherer.util.StaticStrings#EMPTY_STR
+     */
+    static public boolean isLegacyMDS(Document document) {
+    ///ystem.err.println("isLegacyMDS(): l_d = " + document.getDocumentElement().getAttribute(StaticStrings.LANGUAGEDEPENDANT_ATTRIBUTE));
+    return (document.getDocumentElement().getAttribute(StaticStrings.LANGUAGEDEPENDANT_ATTRIBUTE)).equals(StaticStrings.EMPTY_STR);
     }
 

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

@@ -325 +325 @@
     return description;
     }
+
     /** Method to retrieve the <strong>Document</strong> associated with this metadata set.
      * @return The <strong>Document</strong> representing this metadata set.
@@ -557 +558 @@
     private String getAttribute(String element_name, String default_string) {
     String result = null;
+
     // Determine the language code.
     current_language_code = Gatherer.config.getLanguage();
+
+    ///ystem.err.println("Searching for the " + element_name + " in " + current_language_code);
 
     // New Metadata Set Format makes use of deferred-node-expansion to save memory - rather than create nodes for a name and description in each language, nodes which have potentially huge strings, we instead create simplier SETLANGUAGE nodes, and then only expand the one in the desired language. Of course if a user happens to change to every available language slightly more memory will be used than in the old method. For instance consider the DLS with 25 languages, each with a name node of 50 bytes and an descriptions of 500. Thus old style > 13750 bytes while new style < 600.
@@ -565 +569 @@
         Element set_language_element = (Element) set_language_elements.item(b);
         String code = set_language_element.getAttribute(StaticStrings.CODE_ATTRIBUTE).toLowerCase();
-        if(code.equals(current_language_code) || name == null) {
+        if(code.equals(current_language_code)) {
         NodeList specific_elements = set_language_element.getElementsByTagName(element_name);
         if(specific_elements.getLength() > 0) {