Changeset 5154

Timestamp:

2003-08-18T13:56:31+12:00 (21 years ago)

Author:

jmt12

Message:

Fix 203B009

Location:

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

Files:

• ElementWrapper.java (modified) (3 diffs)
• MSMUtils.java (modified) (9 diffs)
• MetadataSet.java (modified) (1 diff)
• MetadataSetManager.java (modified) (9 diffs)

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

@@ -35 +35 @@
  *########################################################################
  */
-
- 
-
-
-
-
-/* GPL_HEADER */
 package org.greenstone.gatherer.msm;
 /**************************************************************************************
@@ -52 +45 @@
 import java.util.TreeSet;
 import org.greenstone.gatherer.msm.MSMUtils;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
 import org.w3c.dom.Element;
@@ -185 +179 @@
     return Utility.formatHTMLWidth(MSMUtils.getDescription(element), 60);
     }
+
+    public boolean hasValueTree() {
+    return element.getAttribute(StaticStrings.VALUE_TREE_ATTRIBUTE).equalsIgnoreCase(StaticStrings.TRUE_STR);
+    }
+
     /** Increment the number of occurances of this metadata element. 
-      * @see org.greenstone.gatherer.msm.MSMUtils
-      */
+     * @see org.greenstone.gatherer.msm.MSMUtils
+     */
     public void inc() {
     MSMUtils.setOccurance(element, 1);
     }
-
+    
     public boolean isHierarchy() {
-    return element.getAttribute("hierarchy").equalsIgnoreCase("true");
+    return element.getAttribute(StaticStrings.HIERARCHY_ATTRIBUTE).equalsIgnoreCase(StaticStrings.TRUE_STR);
     }
 

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

@@ -6 +6 @@
  * University of Waikato, New Zealand.
  *
- * <BR><BR>
- *
  * Author: John Thompson, Greenstone Digital Library, University of Waikato
  *
- * <BR><BR>
- *
  * Copyright (C) 1999 New Zealand Digital Library Project
- *
- * <BR><BR>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21 +15 @@
  * (at your option) any later version.
  *
- * <BR><BR>
- *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * <BR><BR>
  *
  * You should have received a copy of the GNU General Public License
@@ -35 +25 @@
  *########################################################################
  */
-
- 
-
-
-
-
-/* GPL_HEADER */
 package org.greenstone.gatherer.msm;
 /**************************************************************************************
@@ -49 +32 @@
  * Written:        /  /01
  * Revised:      16/08/02 Improved 
+ *               06/08/03 Bug fixes
  * @author John Thompson, Greenstone Digital Libraries
  * @version 2.3
@@ -59 +43 @@
 import org.greenstone.gatherer.msm.MetadataSet;
 import org.greenstone.gatherer.util.ArrayTools;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
 import org.greenstone.gatherer.valuetree.GValueModel;
@@ -79 +64 @@
     /** The character used to separate name space from metadata element. */
     static public final char NS_SEP= '.';
+    /** The character used to separate subfields from metadata element. */
+    static public final String SF_SEP= "#";
     /** Method to add one node as a child of another, after migrating into the target document.
      * @param parent The <strong>Node</strong> we are inserting into.
@@ -392 +379 @@
         comment = getValue(comment_node);
     }
+    if(!definition.endsWith(StaticStrings.SPACE_CHARACTER) && !comment.startsWith(StaticStrings.SPACE_CHARACTER)) {
+        comment = StaticStrings.SPACE_CHARACTER + comment;
+    }
     String description = definition + comment;
     return Utility.stripNL(description.trim());
@@ -417 +407 @@
      */
     static final public String getFullIdentifier(Node element, String namespace) {
+    StringBuffer identifier_buffer = new StringBuffer();
     if(element == null) {
         return "Error";
     }
-    // Get namespace for given element.
-    Element root = (Element)element.getParentNode();
+    // First get the root node.
+    Document document = element.getOwnerDocument();
+    Element root = document.getDocumentElement();
+    document = null;
+    // Retrieve this elements identifier
+    identifier_buffer.append(getIdentifier(element));
+    // Now we check if element has a parent node, other than root. If so we begin building up the full identifier
+    Element parent_element = (Element) element.getParentNode();
+    while(parent_element != null && parent_element != root) {
+        identifier_buffer.insert(0, SF_SEP);
+        identifier_buffer.insert(0, getIdentifier(parent_element));
+        parent_element = (Element)parent_element.getParentNode();
+    }
+    parent_element = null;
+    // Finally insert the namespace and we are all done.
     if(root != null) {
-        String identifier = root.getAttribute("namespace");
-                // Get name and return it.
-        if(identifier.equals("")) {
-        identifier = Utility.EXTRACTED_METADATA_NAMESPACE;
-        }
-        return identifier + NS_SEP + getIdentifier(element);
+        namespace = root.getAttribute("namespace");
     } 
-    if (namespace.equals("")) {
-        return getIdentifier(element); // No namespace anymore
-    } 
-    return namespace + NS_SEP + getIdentifier(element);
+    root = null;
+    // If no root, or no namespace found, assume its extracted (at least then they can't edit it)
+    if(namespace == null || namespace.equals("")) {
+        namespace = Utility.EXTRACTED_METADATA_NAMESPACE;
+    }
+    identifier_buffer.insert(0, NS_SEP);
+    identifier_buffer.insert(0, namespace);
+    namespace = null;
+    return identifier_buffer.toString();
     } // static public String getFullIdentier(Node element)
 
@@ -450 +454 @@
      * @return A <strong>String</strong> representing this given elements fully namespace qualified name.
      */
-    static final public String getFullName(Element element, String def_namespace) {
+    static final public String getFullName(Element element, String namespace) {
+    StringBuffer name_buffer = new StringBuffer();
     if(element == null) {
-        return null;
-    }
-    // Get namespace for given element.
-    Element root = (Element)element.getParentNode();
-    String namespace = "";
-    if (root==null) {
-        namespace = def_namespace;
-    }  else {
-        namespace = root.getAttribute("namespace") ;
-    }
-    String identifier = namespace + NS_SEP + element.getAttribute("name");
-    // Get name and return it.
-    if(identifier.startsWith(".")) {
-        identifier = identifier.substring(1);
-    }
-    return identifier;
+        return "Error";
+    }
+    // First get the root node.
+    Document document = element.getOwnerDocument();
+    Element root = document.getDocumentElement();
+    document = null;
+    // Retrieve this elements name
+    name_buffer.append(element.getAttribute("name"));
+    // Now we check if element has a parent node, other than root. If so we begin building up the full name
+    Element parent_element = (Element) element.getParentNode();
+    while(parent_element != null && parent_element != root) {
+        name_buffer.insert(0, SF_SEP);
+        name_buffer.insert(0, parent_element.getAttribute("name"));
+        parent_element = (Element)parent_element.getParentNode();
+    }
+    parent_element = null;
+    // Finally insert the namespace and we are all done.
+    if(root != null) {
+        namespace = root.getAttribute("namespace");
+    } 
+    root = null;
+    // If no root, or no namespace found, assume its extracted (at least then they can't edit it)
+    if(namespace == null || namespace.equals("")) {
+        namespace = Utility.EXTRACTED_METADATA_NAMESPACE;
+    }
+    name_buffer.insert(0, NS_SEP);
+    name_buffer.insert(0, namespace);
+    namespace = null;
+    return name_buffer.toString();
     } // static public String getFullName(Element element)
 

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

@@ -398 +398 @@
     return null;
     }
+
+    public Element getElement(Element parent_element, String name) {
+    Gatherer.println("Get element named " + name + " from " + parent_element.getAttribute("name"));
+    NodeList elements = parent_element.getElementsByTagName("Element");
+    for(int i = 0; i < elements.getLength(); i++) {
+        Element element = (Element) elements.item(i);
+        if(element.getAttribute("name").equals(name) && element.getParentNode() == parent_element) {
+        elements = null;
+        return element;
+        }
+    }
+    elements = null;
+    return null;
+    }
     /** Method to acquire a list of all the elements in this metadata set. 
      * @return A <strong>NodeList</strong> containing all of this sets elements.

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

@@ -40 +40 @@
 import javax.swing.*;
 import javax.swing.filechooser.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.CommandTokenizer;
@@ -306 +307 @@
     for(int i = elements.size(); i != 0; i--) {
         ElementWrapper element = (ElementWrapper) elements.get(i - 1);
-        if(element.getOccurances() == 0 && element.getNamespace().length() > 0 ) { //&& !element.toString().equals("Source")) {
+        if(element.getOccurances() == 0 && element.getNamespace().length() > 0 && !element.getNamespace().equals(Utility.EXTRACTED_METADATA_NAMESPACE)) {
         elements.remove(element);
         }
@@ -324 +325 @@
     return getElements(false);
     }
+
+    public Vector getElements(boolean all) {
+    return getElements(all, false);
+    }
+
     /** Used to get all the elements in this manager.
      * @param all <i>true</i> if all elements, including hidden, should be returned.
      * @return A Vector of ElementWrappers.
      */
-    public Vector getElements(boolean all) {
+    public Vector getElements(boolean all, boolean force_extracted) {
     Vector all_elements = new Vector();
     for(Enumeration keys = mds_hashtable.keys(); keys.hasMoreElements(); ) {
         MetadataSet mds = (MetadataSet)mds_hashtable.get(keys.nextElement());
-        if(all || !mds.getNamespace().equals(HIDDEN)) {
+        if((!mds.getNamespace().equals(Utility.EXTRACTED_METADATA_NAMESPACE) && !mds.getNamespace().equals(HIDDEN)) 
+           || (mds.getNamespace().equals(Utility.EXTRACTED_METADATA_NAMESPACE) && (Gatherer.config.get("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC) || force_extracted)) 
+           || (mds.getNamespace().equals(Utility.EXTRACTED_METADATA_NAMESPACE) && mds.getNamespace().equals(HIDDEN) && all)) {
         NodeList set_elements = mds.getElements();
-        ///ystem.err.println("The set " + mds + " has " + set_elements.getLength() + " elements.");
+        System.err.println("The set " + mds + " has " + set_elements.getLength() + " elements.");
         for(int i = 0; i < set_elements.getLength(); i++) {
-            ElementWrapper element = new ElementWrapper((Element)set_elements.item(i));
-            // if(!element.toString().equals("Source")) {
-            all_elements.add(element);
-            // }
+            Element raw_element = (Element)set_elements.item(i);
+            ElementWrapper element = new ElementWrapper(raw_element);
+            // For now we do not add subfield elements and their parents, just the subfields.
+            NodeList child_elements = raw_element.getElementsByTagName("Element");
+            if(child_elements.getLength() == 0) {
+            all_elements.add(element);
+            }
         }
         }
@@ -376 +387 @@
      */
     public ElementWrapper getElement(String name) {
+    return getElement(name, false);
+    }
+
+    public ElementWrapper getElement(String name, boolean perfect) {
     ///ystem.err.println("Retrieve element " + name);
     if(name == null) {
-                ///ystem.err.println("No name!");
+        ///ystem.err.println("No name!");
         return null;
     }
@@ -386 +401 @@
     // First we seperate off what set it is in, where we have '<set><namespace_separator><element>'.
     if(name.indexOf(MSMUtils.NS_SEP) != -1) {
-        if(name.startsWith(Utility.EXTRACTED_METADATA_NAMESPACE)) {
-        // Retrieve the correct set if possible.
-        set = (MetadataSet)mds_hashtable.get("");
-        // Now retrieve the element name.
-        element = name.substring(name.indexOf(MSMUtils.NS_SEP) + 1);
-        }
-        else {
-        String namespace = name.substring(0, name.indexOf(MSMUtils.NS_SEP));
-        // Retrieve the correct set if possible.
-        set = (MetadataSet)mds_hashtable.get(namespace);
-        namespace = null;
-        // Now retrieve the element name.
-        element = name.substring(name.indexOf(MSMUtils.NS_SEP) + 1);
-        }
-    }
-    else {
-        // No namespace so assume ns = "".
-        set = (MetadataSet)mds_hashtable.get("");
+        String namespace = name.substring(0, name.indexOf(MSMUtils.NS_SEP));
+        // Retrieve the correct set if possible.
+        set = (MetadataSet)mds_hashtable.get(namespace);
+        namespace = null;
+        // Now retrieve the element name.
+        element = name.substring(name.indexOf(MSMUtils.NS_SEP) + 1);
+    }
+    // If we are looking for a perfect match, we can assume that no namespace means extracted metadata
+    else if(!perfect) {
+        // No namespace so assume that its extracted metadata.
+        set = (MetadataSet)mds_hashtable.get(Utility.EXTRACTED_METADATA_NAMESPACE);
         element = name;
     }
     if(set != null) {
-        ///ystem.err.print("Trying to match element " + element +"?");
-        Element temp = set.getElement(element);
-        if(temp != null) {
-        ///ystem.err.println("Found!");
-        result = new ElementWrapper(temp);
-        }
-        else {
-        ///ystem.err.println("Not found.");
-        }
-        element = null;
-        temp = null;
-    }
-    else {
-                ///ystem.err.println("No such set");
-    }
-    set = null;
-    if(result == null) {
-                ///ystem.err.println("Shouldn't return null unless this is greenstone archive parsing.");
-    }
+        // Now we have a set we are ready to locate the requested element. Break the remaining element name down by the subfield separator, attempting to retrieve the element indicated by each step.
+        if(element.indexOf(MSMUtils.SF_SEP) != -1) {
+        StringTokenizer tokenizer = new StringTokenizer(element, MSMUtils.SF_SEP);
+        // Has to be at least two tokens
+        if(tokenizer.countTokens() >= 2) {
+            Element current_element = set.getElement(tokenizer.nextToken());
+            while(current_element != null && tokenizer.hasMoreTokens()) {
+            current_element = set.getElement(current_element, tokenizer.nextToken());
+            }
+            if(current_element != null) {
+            result = new ElementWrapper(current_element);
+            current_element = null;
+            }
+        }
+        tokenizer = null;
+        }
+        // No subfields - much easier.
+        if(result == null) {
+        ///ystem.err.print("Trying to match element " + element +"?");
+        Element temp = set.getElement(element);
+        if(temp != null) {
+            result = new ElementWrapper(temp);
+        }
+        temp = null;
+        }
+        set = null;
+    }
+    element = null;
     return result;
     }
@@ -465 +482 @@
         return (MetadataSet) mds_hashtable.get(name);
     }
-    else if(name.equals(Utility.EXTRACTED_METADATA_NAMESPACE)) {
-        return (MetadataSet) mds_hashtable.get("");
-    }
-    else {
-        ///ystem.err.println("Couldn't find metadata set.");
-        if(name.equals(HIDDEN)) {
-        return createHidden();
-        }
+    else if(name.equals(HIDDEN)) {
+        return createHidden();
     }
     return null;
@@ -483 +494 @@
     return getSets(true);
     }
+
     public Vector getSets(boolean include_greenstone) {
     Vector result = new Vector();
     for(Enumeration keys = mds_hashtable.keys(); keys.hasMoreElements(); ) {
         MetadataSet set = (MetadataSet)mds_hashtable.get(keys.nextElement());
-        if(!set.getNamespace().equals(HIDDEN) && (include_greenstone || !set.getNamespace().equals(""))) {
+        if(!set.getNamespace().equals(HIDDEN) && (include_greenstone || !set.getNamespace().equals(Utility.EXTRACTED_METADATA_NAMESPACE))) {
         result.add(set);
         }
@@ -493 +505 @@
     return result;
     }
+
     /** Find the total number of elements loaded.
      * @return The element count as an int.
@@ -939 +952 @@
         MetadataSet set = (MetadataSet) mds_hashtable.get(namespace);
         try {
-        File mds_file = null;
-        if(!namespace.equals("")) {
-            mds_file = new File(file, set.getNamespace() + ".mds");
-        }
-        else {
-            mds_file = new File(file, Utility.METADATA_EXTRACTED);
-        }
+        File mds_file = new File(file, set.getNamespace() + ".mds");
         Utility.export(set.getDocument(), mds_file);
         set.setFile(mds_file);
         // Now for each element attempt to save its value tree.
         NodeList elements = set.getElements();
-        for(int i = elements.getLength() - 1;   !namespace.equals("") && i >= 0; i--) {
+        for(int i = elements.getLength() - 1; i >= 0; i--) {
             ElementWrapper value_element = new ElementWrapper((Element)elements.item(i));
-            GValueModel value_tree = set.getValueTree(value_element);
-            if(value_tree != null) {
-            File value_file = new File(file, value_element.getName() + ".mdv");
-            ///ystem.err.println("Saving value file: " + value_file.toString());
-            Utility.export(value_tree.getDocument(), value_file);
-            // If this is a hierarchy element, write hierarchy file.
-            if(value_element.getNamespace().equals(MetadataSetManager.HIDDEN) || value_tree.isHierarchy()) {
-                MetadataXML.write(value_tree, this, Gatherer.c_man.getCollectionEtc());
+            if(value_element.hasValueTree()) {
+            GValueModel value_tree = set.getValueTree(value_element);
+            if(value_tree != null) {
+                File value_file = new File(file, value_element.getName() + ".mdv");
+                ///ystem.err.println("Saving value file: " + value_file.toString());
+                Utility.export(value_tree.getDocument(), value_file);
+                // If this is a hierarchy element, write hierarchy file.
+                if(value_element.getNamespace().equals(MetadataSetManager.HIDDEN) || value_tree.isHierarchy()) {
+                MetadataXML.write(value_element, value_tree, this, Gatherer.c_man.getCollectionEtc());
+                }
             }
-            }
-            else {
-            ///ystem.err.println("No value tree for " + value_element.toString());
             }
         }