Changeset 9085

Timestamp:

2005-02-17T16:21:16+13:00 (19 years ago)

Author:

mdewsnip

Message:

Replaced all hard-wired Unix-style path separators with File.separator, by Matthew Whyte. Also removed a whole lot of unused code.

Location:

trunk/gli/src/org/greenstone/gatherer/gems

Files:

• GEMS.java (modified) (13 diffs)
• MSMUtils.java (modified) (23 diffs)
• MetadataSetManager.java (modified) (20 diffs)

trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java

@@ -670 +670 @@
             if(result == 0) {
                 msm.save();
-
             }
         }
@@ -839 +838 @@
 
         setLocation((config.screen_size.width - ADD_OR_EDIT_ATTRIBUTE_SIZE.width) / 2, (config.screen_size.height - ADD_OR_EDIT_ATTRIBUTE_SIZE.height) / 2);
-    
-            
-           // create dom object for language_Box 
-            //GEMSLanguageManager GemsLangManager = new GEMSLanguageManager("/home/arosmain/gsdl/gli/classes/xml/languages.xml");
+
         GEMSLanguageManager GemsLangManager = new GEMSLanguageManager(Configuration.gsdl_path + File.separator + "gli" + File.separator + "classes" + File.separator + "xml" + File.separator + "languages.xml");
         
@@ -854 +850 @@
            String code = Configuration.getLanguage();
            language_box.setSelectedItem(code);
-           //System.out.println(code);
         }
 
@@ -1014 +1009 @@
            
        }// end currattr == GEMSnode.set
-       
        value.setText(prevValue);
-       
        }
 
@@ -1538 +1531 @@
         }
                 else{
-                    
                        JOptionPane.showMessageDialog(self, Dictionary.get("GEMS.Set_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
-         
                 }
                 
@@ -1551 +1542 @@
                     String anitem = existingSetJComboBox.getSelectedItem().toString();
                    
-                   // if(msm.getSet(namespace_str) == null) {
                     if(a_set_exists_with_this_namespace(namespace_field.getText()) == false){
-       
                         //setup to read the filename from mds file
-                         String [] items = anitem.split("#%");
+            String [] items = anitem.split("#%");
                         try {
-
-            FileInputStream fstream = new FileInputStream(items[1].trim());
-            BufferedReader in = new BufferedReader(new InputStreamReader(fstream, "UTF8"));
-
-                        FileOutputStream out;
-                        PrintWriter p;
-                        //setup to write to filename from existing file
-                        try {
-                        out = new FileOutputStream(Utility.METADATA_DIR + "/"+ namespace_str + ".mds");
-            OutputStreamWriter pout = new OutputStreamWriter(out, "UTF8");
-                        p = new PrintWriter(pout);
-
-            while(in.ready()){
-                String nextline = in.readLine();
-
-                            if(nextline.matches(".+namespace=\".+\".*") == true)
-                {
-                    nextline = nextline.replaceFirst("namespace=\".+\"","namespace=\"" + namespace_str+ "\"");                          
+                FileInputStream fstream = new FileInputStream(items[1].trim());
+                BufferedReader in = new BufferedReader(new InputStreamReader(fstream, "UTF8"));
+                
+                FileOutputStream out;
+                PrintWriter p;
+                //setup to write to filename from existing file
+                try {
+                out = new FileOutputStream(Utility.METADATA_DIR + File.separator+ namespace_str + ".mds");
+                OutputStreamWriter pout = new OutputStreamWriter(out, "UTF8");
+                p = new PrintWriter(pout);
+                
+                while(in.ready()){
+                    String nextline = in.readLine();
+                    
+                    if(nextline.matches(".+namespace=\".+\".*") == true) {
+                    nextline = nextline.replaceFirst("namespace=\".+\"","namespace=\"" + namespace_str+ "\"");                          
+                    }
+                    else {
+                    nextline = nextline.replaceFirst(">.+</Name>",">" + name_str + "</Name>");
+                    }
+                    p.print(nextline + "\n");
                 }
-                            else
-                {
-                    nextline = nextline.replaceFirst(">.+</Name>",">" + name_str + "</Name>");
-                }
-                
-                            p.print(nextline + "\n");
-                        }
-                        p.close();
-                       
-                        MetadataSet loadedset = msm.loadMetadataSet(new File(Utility.METADATA_DIR + "/" + namespace_str + ".mds"));
-                         model.add(null, loadedset, GEMSNode.SET);
-                        }
-                        catch(Exception e){
-                            System.out.println("Print file error");
-
-                        }
-
+                p.close();
+                
+                MetadataSet loadedset = msm.loadMetadataSet(new File(Utility.METADATA_DIR + File.separator + namespace_str + ".mds"));
+                model.add(null, loadedset, GEMSNode.SET);
+                }
+                catch(Exception e){
+                System.out.println("Print file error");
+                }
                         }
                         catch(Exception e){
@@ -1600 +1583 @@
                     }//msm.getset(namespacE) == null
                     else{
-                        
-                      JOptionPane.showMessageDialog(self, Dictionary.get("GEMS.Set_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(self, Dictionary.get("GEMS.Set_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
                     }
-             setVisible(false);
+            setVisible(false);
                 }
-
         } //if(source == ok_button)
         else if(source == cancel_button) {
@@ -1644 +1625 @@
         center_pane.setOpaque(false);
 
-    
         JPanel boxes_pane = new JPanel();
 
@@ -1809 +1789 @@
             }
             ignore = false;
-                    
             atLeastOneSetChanged= true;
         }
@@ -2014 +1993 @@
         else
         {
-            name_field.setText(current_set.getName()); //getName() doesn't work properly. Need to update MetadataSet.java
-            //getName() only doesn't work when the name is exactly the same as the namespace.
+            name_field.setText(current_set.getName());
             namespace_field.setText(current_set.getNamespace());
             setVisible(true); //Show the dialog
-        }
-            
+        }   
         source = null;
     }
     
-
     public void dispose() {
         cancel_button = null;
@@ -2030 +2006 @@
         super.dispose();
     }
-
     }
 
@@ -2176 +2151 @@
     }
     
-
     public void dispose() {
         cancel_button = null;
@@ -2183 +2157 @@
         super.dispose();
     }
-
     }
 

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

@@ -41 +41 @@
  */
 public class MSMUtils {
-    /** Used to order metadata according to set standard element order then alphabetically by value. */
-    // static private MetadataComparator METADATA_COMPARATOR = new MetadataComparator();
-    /** An element of the enumeration of type filter. */
-    static public int NONE = 0;
-    /** An element of the enumeration of type filter. */
-    static public int VALUES = 1;
-    /** An element of the enumeration of type filter. */
-    static public int ALIASES = 2;
-    /** An element of the enumeration of type filter. */
-    static public int BOTH = 3;
-    /** The character used to separate name space from metadata element. */
-    static public char NS_SEP= '.';
-    /** The character used to separate subfields from metadata element. */
-    static public String SF_SEP= "^";
+    static public int NONE = 0;     //An element of the enumeration of type filter.
+    static public int VALUES = 1;   //An element of the enumeration of type filter.
+    static public int ALIASES = 2;  //An element of the enumeration of type filter.
+    static public int BOTH = 3;     //An element of the enumeration of type filter.
+    static public char NS_SEP= '.'; //The character used to separate name space from metadata element.
+    static public char SF_SEP= '^'; //The character used to separate subfields from metadata element.
+
     /** 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.
@@ -122 +115 @@
 
 
-    /** A method for comparing two AssignedValues trees. This compares not only the Subject hierarchies but also the values themselves.
-     * @param avt A <strong>Node</strong> which is the root of an AssignedValues tree.
-     * @param bvt The <strong>Node</strong> which is the root of the tree we wish to compare it to.
-     * @return <i>true</i> if the two trees are equal, <i>false</i> otherwise.
-     */
-    static final private boolean assignedValuesEqual(Node avt, Node bvt) {
-    if(avt == null && bvt == null) {
-        return true; // Both are null so both are equal.
-    }
-    else if(avt == null || bvt == null) {
-                // One is null and the other isn't.
-        return false;
-    }
-    else {
-        Hashtable a_map = new Hashtable();
-        getValueMappings(avt, null, a_map);
-        Hashtable b_map = new Hashtable();
-        getValueMappings(bvt, null, b_map);
-        if(a_map.size() == b_map.size()) {
-        /** @TODO - Figure out what to do now. */
-        return true;
-        }
-    }
-    return false;
-    }
-    /** A method for comparing two attribute nodes of type Node not Attr as you might think. Attr objects are used to describe the attributes of tags themselves, while in a metadata set we intend attribute nodes to describe qualities of metadata elements. It's just confusing because the two systems (DOM model and Dublin Core) are quite similar.
-     * @param an A <strong>Node</strong> representing some attribute of an element.
-     * @param bn The <strong>Node</strong> we wish to compare it to.
-     * @return <i>true</i> if and only if the attributes are equal.
-     */
-    static final public boolean attributesEqual(Node an, Node bn) {
-    // Check we are comparing apples and apples...
-    if(an.getNodeName().equals("Attribute") && bn.getNodeName().equals("Attribute")) {
-        Element ae = (Element) an;
-        Element be = (Element) bn;
-                // Ensure we are comparing the same type of attribute.
-        if(ae.getAttribute("name").equals(be.getAttribute("name"))) {
-        // And finally retrieve and compare the values.
-        if(getValue(ae).equals(getValue(be))) {
-            // We have a match.
-            return true;
-        }
-        }
-    }
-    // And if anything goes wrong we can't be dealing with equal attributes.
-    return false;
-    }
-
-    /** Remove all of the child nodes from a certain node. */
-    static final public void clear(Node parent) {
-    while(parent.hasChildNodes()) {
-        parent.removeChild(parent.getFirstChild());
-    }
-    }
-
-    /** Method to compare two metadata elements (of type Element, which is bound to get more than a bit confusing) for equality. This test may only check the structural (ie pretty much unchanging) consistancy, or may include the AssignedValue tree as well (which will be different for each collection I'd imagine).
-     * @param a_set The <strong>MetadataSet</strong> a comes from.
-     * @param ae An <strong>Element</strong>.
-     * @param b_set The <strong>MetadataSet</strong> b comes from.
-     * @param be The <strong>Element</strong> to compare it to.
-     * @param values <i>true</i> if the AssignedValues tree should also be compared, <i>false</i> otherwise.
-     * @return <i>true</i> if the elements are equal, <i>false</i> otherwise.
-     */
-    static final public boolean elementsEqual(MetadataSet a_set, Element ae, MetadataSet b_set, Element be, boolean values) {
-    // Compare Element Attr(ibutes) within the DOM, not to be confused with comparing element attributes in a Dublin Core sense...
-    NamedNodeMap aas = ae.getAttributes();
-    NamedNodeMap bas = be.getAttributes();
-    // For each attribute in a...
-    for(int i = 0; i < aas.getLength(); i++) {
-        Attr aa = (Attr)aas.item(i);
-                // Try to retrieve an attribute of the same name from b.
-        Attr ba = (Attr)bas.getNamedItem(aa.getNodeName());
-                // Now if there was no such attribute, or if the values for the
-                // two attributes are different the structures different.
-        if(ba == null || (!aa.getValue().equals(ba.getValue()))) {
-        //ystem.err.println("Attributes are not equal");
-        return false;
-        }
-    }
-    // Quickest test of children is to see we have the same number in
-    // each. Remember to modify for missing AssignedValues which have
-    // nothing to do with structure.
-    int anc = getAttributeCount(ae);
-    int bnc = getAttributeCount(be);
-    if(anc != bnc) {
-        return false;
-    }
-    // Now we compare the child nodes of the two Elements taking into 
-    // account three special cases...
-    // 1. We don't test the AssignedValues element here.
-    // 2. Remember OptionList node.
-    // 3. The Attributes of each metadata element.
-    // For each child node of a.
-    for(Node an = ae.getFirstChild(); an !=null; an =an.getNextSibling()) {
-        if(an.getNodeName().equals("OptionList")) {
-        //ystem.err.println("Matching OptionLists.");
-        Node bn = getNodeFromNamed(be, "OptionList");
-        if(bn == null || !optionListsEqual(an, bn)) {
-            //ystem.err.println("OptionLists are not equal");
-            return false;
-        }
-        }
-                // Matching attributes.
-        else if(an.getNodeName().equals("Attribute")) {
-        //ystem.err.println("Matching Attributes.");
-        boolean matched = false;
-        for(Node bn = be.getFirstChild(); bn != null && !matched;
-            bn = bn.getNextSibling()) {
-            if(bn.getNodeName().equals("Attribute")) {
-            matched = attributesEqual(an, bn);
-            }
-        }
-        if(!matched) {
-            //ystem.err.println("Cannot match attribute.");
-            return false;
-        }
-        }
-    }
-    // Finally, if we've been asked to compares value trees (for some unknown reason) go ahead and compare them too.
-    if(values) {
-        GValueModel avt = a_set.getValueTree(new ElementWrapper(ae));
-        GValueModel bvt = b_set.getValueTree(new ElementWrapper(be));
-        return assignedValuesEqual(avt.getDocument().getDocumentElement(), bvt.getDocument().getDocumentElement());
-    }
-    // If we've got this far the elements match!
-    return true;
-    }   
-    /** This method extracts the assigned value trees details, if any, from a certain element and stores them in an array ready to be passed as arguments to the Dictionary.
-     * @param element The <strong>Element</strong> whose values we wish to view.
-     * @return A <strong>String[]</strong> containing the details of the assigned values tree.
-     * @see org.greenstone.gatherer.Dictionary
-     */
-    static final public String[] getAssignedValuesDetails(MetadataSet mds, Element element) {
-    String details[] = null;
-    //Node avt = getNodeFromNamed(element, "AssignedValues");
-    GValueModel avt = mds.getValueTree(new ElementWrapper(element));
-    if(avt != null) {
-        Hashtable mapping = new Hashtable();
-        getValueMappings(avt.getDocument().getDocumentElement(), null, mapping);
-        ArrayList values = new ArrayList(mapping.keySet());
-        Collections.sort(values);
-        details = new String[1];
-        for(int i = 0; i < values.size(); i++) {
-        if(details[0] == null) {
-            details[0] = "   " + values.get(i);
-        }
-        else {
-            details[0] = details[0] + "\n   " + values.get(i);
-        }
-        }
-        mapping = null;
-        values = null;
-    }
-    avt = null;
-    return details;
-    }
-
     /** Retrieve all of the attributes for the given element as a tree set. Note that this requires significant manipulation if the source is a multilingual optimized metadata set.
      * @param element the Element whose attributes we wish to catalog
@@ -305 +141 @@
                 }
         else if(some_element_name.equals(StaticStrings.LANGUAGE_ELEMENT)) {
-                    ///Added by Attila on Nov 05 04
-            //System.out.println(some_element_name +  "<- some_element nodes' value"); //debug
-                    
             String language_code = some_element.getAttribute(StaticStrings.CODE_ATTRIBUTE);
             NodeList attribute_elements = some_element.getElementsByTagName(StaticStrings.ATTRIBUTE_ELEMENT);
@@ -317 +150 @@
                                 
                                if(enabled_langs[k].trim().compareTo(some_element.getAttributes().item(0).getNodeValue().toString()) == 0){
-                     
-                                 attribute_tree.add(new Attribute(attribute_element.getAttribute(StaticStrings.NAME_ATTRIBUTE), language_code, MSMUtils.getValue(attribute_element)));
-                     attribute_element = null;
-                                 
-                                 break;
+                   attribute_tree.add(new Attribute(attribute_element.getAttribute(StaticStrings.NAME_ATTRIBUTE), language_code, MSMUtils.getValue(attribute_element)));
+                   attribute_element = null;
+                   
+                   break;
                                }
-                               //else {
-                               //    System.out.println(enabled_langs[k].trim().toString() + some_element.getAttributes().item(0).getNodeValue().toString());
-                              // }
-                           
                             }
-                        //  enabled_languages_split[k].toLowerCase().trim();
-              
-                            
-                       // if(match_exit_flag == false)
-                            // break;
-                        //add language specific attr's:
-            //attribute_tree.add(new Attribute(attribute_element.getAttribute(StaticStrings.NAME_ATTRIBUTE), language_code, MSMUtils.getValue(attribute_element)));
-            attribute_element = null;
-            }
+                attribute_element = null;
+           } 
             attribute_elements = null;
             language_code = null;
@@ -347 +168 @@
     }
 
-    /** Method to count the number of Attribute nodes under a certain Element. This ignores other nodes such as #text, OptionList and AssignedValues nodes.
-     * @param element The <strong>Element</strong> whose attributes you want to count.
-     * @return An <i>int</i> which is the number of attribute nodes.
-     */
-    static final private int getAttributeCount(Node element) {
-    int count = 0;
-    for(Node n = element.getFirstChild(); n != null; 
-        n = n.getNextSibling()) {
-        if(n.getNodeName().equals("Attribute")) {
-        count++;
-        }
-    }
-    return count;
-    }
-
-    /** This method is a slight variation on getNodeNamed in that it is especially written to retrieve the attribute Nodes of a certain name present under the given element.
-     * @param element The target element <strong>Node</strong>.
-     * @param name The name of the attribute you wish to return.
-     * @return An <strong>Element[]</strong> containing the attributes you requested, or <i>null</i> if no such attributes exists.
-     */
-    static final public Element[] getAttributeNodesNamed(Node element, String name) { 
-    Element attributes[] = null;
-    for(Node n = element.getFirstChild(); n != null; n = n.getNextSibling()) {
-        if(n.getNodeName().equals("Attribute")) {
-        Element e = (Element)n;
-        if(e.getAttribute("name").equals(name)) {
-            if(attributes == null) {
-            attributes = new Element[1];
-            attributes[0] = e;
-            }
-            else {
-            Element temp[] = attributes;
-            attributes = new Element[temp.length + 1];
-            System.arraycopy(temp, 0, attributes, 0, temp.length);
-            attributes[temp.length] = e;
-            temp = null;
-            }
-        }
-        e = null;
-        }
-    }
-    return attributes;
-    }
 
     /** Method to construct an elements description by retrieving the correct attribute.
@@ -411 +189 @@
     return description.toString();
     }
+
 
     /** Retrieve the value for the requested attribute in the required language. Once again this method must be aware of the differences between the old metadata sets and the new multilingual optimized ones.
@@ -486 +265 @@
             target_name_str = null;
         }
-        //else {
-        ///ystem.err.println("Second level");
-        //}
         attribute_element = null;
         }
         attribute_elements = null;
-
     }
     document = null;
@@ -498 +273 @@
     }
 
-    /*************************************************************************/
+
+
     /** Method to construct an elements fully qualified name. Note that this is different from a nodes identifier. Think of name as a short, unique reference to a metadata element, whereas identifier can be much longer, language specific and non-unique.
      * @param element An <strong>Element</strong> whose name we are interested in.
@@ -507 +283 @@
 
     }
-    /*************************************************************************/
+
+
     /** Method to construct an elements fully qualified name. Note that this is different from a nodes identifier. Think of name as a short, unique reference to a metadata element, whereas identifier can be much longer, language specific and non-unique.
      * @param element An <strong>Element</strong> whose name we are interested in.
@@ -548 +325 @@
     } // static public String getFullName(Element element)
 
+
     /**
        Method to get an element's name, not including its namespace.
@@ -584 +362 @@
     return identifier;
     }
-
 
 
@@ -602 +379 @@
     return child;
     }
+
+
     /** Look for the occurances 'field' of the element and return it if found.
      * @return An <i>int</i> which matches the number in the occurances attribute of the element, or 0 if no such attribute.
@@ -618 +397 @@
     return count;
     }    
-    /** This method extracts the option list details, if any, from a certain element and stores them in an array ready to be passed as arguments to the <strong>Dictionary</strong>.
-     * @param element The <strong>Element</strong> whose option list we wish to view.
-     * @return A <strong>String[]</strong> containing the details of the option list.
-     * TODO implement.
-     * @see org.greenstone.gatherer.Dictionary
-     */
-    static final public String[] getOptionListDetails(Element element) {
-    return null;
-    }
-
-
-    /** This method extracts the structural details from a certain element and stores them in an array, all ready for passing to the <strong>Dictionary</strong>.
-     * @param element The <Strong>Element</strong> whose details we wish to gather.
-     * @return A <strong>String[]</strong> containing the structural details.
-     */
-    static final public String[] getStructuralDetails(MetadataSet mds, Element element) {
-    String details[] = new String[4];
-    //Element root = (Element)element.getParentNode();
-    //details[0] = root.getAttribute("name");
-    //details[1] = root.getAttribute("namespace");
-    details[0] = mds.getName();
-    details[1] = mds.getNamespace();
-    details[2] = getFullName(element);
-    details[3] = null;
-    // Get attributes
-    Vector attributes = new Vector();
-    for(Node n=element.getFirstChild(); n!=null; n=n.getNextSibling()) {
-        if(n.getNodeName().equals("Attribute")) {
-        Element temp = (Element)n;
-        attributes.add(temp.getAttribute("name") + "=" + getValue(n));
-        }
-    }
-    // Sort attributes
-    Collections.sort(attributes);
-    // Add attributes to details.
-    for(int i = 0; i < attributes.size(); i++) {
-        if(details[3] == null) {
-        details[3] = "   " + attributes.get(i);
-        }
-        else {
-        details[3] = details[3] + "\n   " + attributes.get(i);
-        }
-    }
-    return details;
-    }
+
 
     /** Method to retrieve the value of a given node (not the assigned values tree!).
@@ -687 +422 @@
     return "";
     }
+
 
     /** Method to traverse the given value tree, and build up a hashtable of mappings between the value path key names and the Subject nodes of the tree.
@@ -717 +453 @@
     }
     }
+
+
     /** Parses the value tree template file.
      * @return The Document parsed.
@@ -723 +461 @@
     return Utility.parse(GEMS.METADATA_VALUE_TEMPLATE, true);
     }
+
 
     /** Determine if the named attribute is language specific for this collection. This information is found in a DOM attribute of the document element, as a comma separated list of attribute names.
@@ -748 +487 @@
     }
 
-    /** 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_dependent 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#LANGUAGEDEPENDENT_ATTRIBUTE
-     * @see org.greenstone.gatherer.util.StaticStrings#EMPTY_STR
-     */
-    static private boolean isLegacyMDS(Document document) {
-    ///ystem.err.println("isLegacyMDS(): l_d = " + document.getDocumentElement().getAttribute(StaticStrings.LANGUAGEDEPENDENT_ATTRIBUTE));
-    return (document.getDocumentElement().getAttribute(StaticStrings.LANGUAGEDEPENDENT_ATTRIBUTE)).equals(StaticStrings.EMPTY_STR);
-    }
-
-    /** Method to compare two OptionsLists for equality.
-     * @param al A <strong>Node</strong> which represents an OptionList.
-     * @param bl The <strong>Node</strong> we wish to test against.
-     * @return A <i>boolean</i> which is <i>true</i> if the two option lists are equal, <i>false</i> otherwise.
-     * TODO Implementation
-     */
-    static final private boolean optionListsEqual(Node al, Node bl) {
-    // Compare the 'restricted' attribute of the two lists.
-    Element ae = (Element) al;
-    Element be = (Element) bl;
-    if(!ae.getAttribute("restricted").equals
-       (be.getAttribute("restricted"))) {
-        return false;
-    }
-    // Compare the Values under each list.
-    for(Node an = al.getFirstChild(); an != null; 
-        an = an.getNextSibling()){
-        if(an.getNodeName().equals("Value")) {
-        boolean matched = false;
-        for(Node bn = bl.getFirstChild(); bn != null && !matched;
-            bn = bn.getNextSibling()) {
-            if(bn.getNodeName().equals("Value")) {
-            matched = valuesEqual(an, bn);
-            }
-        }
-        if(!matched) {
-            return false;
-        }
-        }
-    }
-    return true;
-    }
 
     /** A method to remove a specific attribute element from an element. This attribute must match in name, language and in value before being removed. Note that this method supports both legacy and multilingual optimized versions of the mds.
@@ -891 +587 @@
     }
 
+
     /** can only be used to set the english value */
     static final public void setIdentifier(Node element, String value) {
@@ -906 +603 @@
     }
     }
+
+
     /** Set the value of the element attribute occurances.
      * @param element The <strong>Element</strong> to change.
@@ -914 +613 @@
     element.setAttribute("occurances", new_value.toString());
     }
+
 
     /** Set the #text node value of some element.
@@ -928 +628 @@
     }
 
+
     /** This method also traverses the tree, but this one is used to gather all the values and aliases at once, and to 'prune' the tree if necessary.
      * @param current The current root <strong>Node</strong> of this AssignedValues tree subtree.
@@ -966 +667 @@
     }
 
-    /** This method is used to systematically merge two AssignedValues tree. Both trees have their current values mapped, then the new tree is searched for key paths that don't exist in the current tree. If such a key is found, the Subject <strong>Node</strong> it maps to is retrieved and then imported and added to whatever was the closest available node (in terms of tree path) in the current tree.
-     * @param a_set The MetadataSet from which the Element a came from.
-     * @param a The Element at the root of the current AssignedValues tree.
-     * @param b_set The MetadataSet from which the Element b came from.
-     * @param b The root Element of the tree that is being merged.
-     * @return A <i>boolean</i> which is <i>true</i> if the trees merged without error, <i>false</i> otherwise.
-     */
-    static final public boolean updateValueTree(MetadataSet a_set, Element a, MetadataSet b_set, Element b) {
-    GValueModel avt = a_set.getValueTree(new ElementWrapper(a));
-    GValueModel bvt = b_set.getValueTree(new ElementWrapper(b));
-    // If neither element even has a value tree, we're all done.
-    if(avt == null && bvt == null) {
-        avt = null;
-        bvt = null;
-        return true;
-    }
-    // If the new element has no value tree then nothing needs to be done.
-    else if(avt != null && bvt == null) {
-        avt = null;
-        bvt = null;
-        return true;
-    }
-    // If only the new element has a value tree, then add all of its values
-    // immediately.
-    else if(avt == null && bvt != null) {
-        a_set.addValueTree(new ElementWrapper(a), bvt);
-        avt = null;
-        bvt = null;
-        return true;
-    }
-    // We have both trees for both elements, time to merge.
-    else {
-        Document document = avt.getDocument();
-        Hashtable a_map = new Hashtable();
-        getValueMappings(document.getDocumentElement(), null, a_map);
-        Hashtable b_map = new Hashtable();
-        getValueMappings(bvt.getDocument().getDocumentElement(), null, b_map);
-                // For each new entry in b_map
-        for(Enumeration b_keys = b_map.keys(); b_keys.hasMoreElements(); ) {
-        String b_key = (String)b_keys.nextElement();
-        // Test if there is already an entry in a_map.
-        if(!a_map.containsKey(b_key)) {
-            // If not, search through a_map for the longest match.
-            Node target = document.getDocumentElement();
-            String last_match = null;
-            for(Enumeration a_keys = a_map.keys(); 
-            a_keys.hasMoreElements(); ) {
-            String a_key = (String)a_keys.nextElement();
-            if(b_key.startsWith(a_key)) {
-                if(last_match == null || a_key.length() > last_match.length()) {
-                last_match = a_key;
-                target = (Node)a_map.get(a_key);
-                }
-            }
-            a_key = null;
-            }
-            // Now import the node at b_key and add it to target.
-            Node subtree = (Node)b_map.get(b_key);
-            subtree = document.importNode(subtree, true);
-            // Find the node to insert before...
-            String name = getValue(subtree);
-            Node move = null;
-            for(Node n = target.getFirstChild(); n != null && move == null; n = n.getNextSibling()) {
-            if(n.getNodeName().equals("Subject")) {
-                if(name.compareTo(getValue(n)) <= 0) {
-                move = n;
-                }
-            }
-            }
-            if(move == null) {
-            target.appendChild(subtree);
-            }
-            else {
-            target.insertBefore(subtree, move);
-            }
-            target = null;
-            last_match = null;
-            subtree = null;
-            name = null;
-            move = null;
-        }
-        b_key = null;
-        }
-        document = null;
-        a_map = null;
-        b_map = null;
-        avt = null;
-        bvt = null;
-        return true;
-    }
-    }
+
+    /** 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 private boolean isLegacyMDS(Document document) {
+    ///ystem.err.println("isLegacyMDS(): l_d = " + document.getDocumentElement().getAttribute(StaticStrings.LANGUAGEDEPENDANT_ATTRIBUTE));
+    return (document.getDocumentElement().getAttribute(StaticStrings.LANGUAGEDEPENDENT_ATTRIBUTE)).equals(StaticStrings.EMPTY_STR);
+    }
+
+
+    /** Remove all of the child nodes from a certain node. */
+    static final public void clear(Node parent) {
+    while(parent.hasChildNodes()) {
+        parent.removeChild(parent.getFirstChild());
+    }
+    }
+ 
 
     /** Method to determine if two Value nodes are equal.
@@ -1076 +706 @@
     return false;
     }
-
-    /** A comparator for sorting metadata element-value pairs into their standard order (elements) then alphabetical order (values). */
-//     static final private class MetadataComparator
-//  implements Comparator {
-//  /** Compares its two arguments for order. */
-//  public int compare(Object o1, Object o2) {
-//      int result = 0;
-//      ElementWrapper e1 = null;
-//      ElementWrapper e2 = null;
-//      String v1 = null;
-//      String v2 = null;
-//      if(o1 instanceof Metadata && o2 instanceof Metadata) {
-//      Metadata m1 = (Metadata) o1;
-//      Metadata m2 = (Metadata) o2;
-//      ///ystem.err.println("MSMUtils.compare(" + m1 + ", " + m2 + ") = ");
-//      e1 = m1.getElement();
-//      e2 = m2.getElement();
-//      v1 = m1.getValue().toLowerCase();
-//      v2 = m2.getValue().toLowerCase();
-//      }
-//      else if(o1 instanceof ElementWrapper && o2 instanceof ElementWrapper) {
-//      e1 = (ElementWrapper) o1;
-//      e2 = (ElementWrapper) o2;
-//      }
-//      if(e1 != null && e2 != null) {
-//      // First we compare the namespaces
-//      result = e1.getNamespace().compareTo(e2.getNamespace());
-//      if(result == 0 && Gatherer.c_man != null && Gatherer.c_man.ready() && e1.getNamespace() != null) {
-//          // Now, given both elements are in the same set, we compare the element ordering using methods in MetadataSet
-//          MetadataSet set = Gatherer.c_man.getCollection().msm.getSet(e1.getNamespace());
-//          ///ystem.err.print("MetadataSet.compare(" + e1 + ", " + e2 + ") = ");
-//          if(set != null) {
-//          result = set.compare(e1.getElement(), e2.getElement());
-//          ///ystem.err.println(result);
-//          if(result == 0 && v1 != null && v2 != null) {
-//              // Finally we compare the values alphabetically.
-//              result = v1.compareTo(v2);
-//          }
-//          }
-//          else {
-//          return 0;
-//          }
-//      }
-//      }
-//      else {
-//      result = o1.toString().compareTo(o2.toString());
-//      }
-//      ///ystem.err.println("Result: " + result);
-//      return result;
-//  }
-          
-//  /** Indicates whether some other object is "equal to" this Comparator. */
-//  public boolean equals(Object obj) { 
-//      return compare(this, obj) == 0;
-//  }
-//     }
 }

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

@@ -59 +59 @@
  */
 public class MetadataSetManager {
-
-    /** The character used to separate name space from metadata element. */
-    static public char NS_SEP= '.';
-    /** The character used to separate subfields from metadata element. */
-    static public String SF_SEP= "#";
-
-    /** The name of the hidden, or system, metadata set. */
-    static final public String HIDDEN = "hidden";
+    static final public String HIDDEN = "hidden"; //The name of the hidden, or system, metadata set.
     static final public int MAX_LOADED_SETS = 64;
     static public CollectionManager col_man = null;
-    /** A mapping from metadata namespace to metadata set. */
-    static private Hashtable mds_hashtable = new Hashtable();
+    static private Hashtable mds_hashtable = new Hashtable(); //A mapping from metadata namespace to metadata set.
     public GEMS gemsptr;
     
-    /** The profiler is responsible for remembering what actions a user has requested when importing metadata, so as to prevent the user needlessly re-entering this information for each import. */
-    // public MSMProfiler profiler = null;
-
 
     /** Constructor. */
@@ -92 +81 @@
     mds.setAttribute("lastchanged", Utility.getDateString() + " - " + user_name + " on " + machine_name);
     // And the remaining attributes.
-    //mds.setAttribute("name", name);
     mds.setAttribute("namespace", namespace);
     // Add the name element.
@@ -103 +91 @@
     return mds;
     }
+
 
     /**
@@ -134 +123 @@
 
 
-    public Vector getVectorSets() {   
-        Vector sets = new Vector();
-        
-        File metadata_directory = new File(Utility.METADATA_DIR);
-    if (metadata_directory.exists()) {
-        // Load just those .mds files in this directory, and return them
-        File[] directory_files = metadata_directory.listFiles();
-        for (int i = 0; i < directory_files.length; i++) {
-        File child_file = directory_files[i];
-        if (!child_file.isDirectory() && child_file.getName().endsWith(".mds")) {
-            System.err.println("Found mds file: " + child_file);
-            MetadataSet metadata_set = loadMetadataSet(child_file);
-                  //  metadata_set.getName();
-                    sets.add(new String(child_file.toString() + " ^ " + metadata_set.getName()));
-            //model.add(null, metadata_set, GEMSNode.SET);
-        }
-        }
-    }
-        return sets;
-    }
-    public Object [] getVectorSetsToStringArray() {
-        
-        return getSets().toArray();    
-    }
     /** Add a value tree to a given metadata element represented as a GValueModel
      * @param model The <strong>GValueTree</strong> model
@@ -188 +153 @@
     return getElements(all, false);
     }
+
 
     /** Used to get all the elements in this manager.
@@ -217 +183 @@
     }
 
+
     /** Retrieve a metadata element by its index.
      * @param index The specified index as an int.
@@ -229 +196 @@
     return result;
     }
+
     /** Retrieve a metadata element by looking at the current metadata element. Note that this 'index' element may now be disconnected from the DOM model, so we have to reload the target element by the string method.
      * @param element The possibly out-of-data MetadataElement.
@@ -236 +204 @@
     return getElement(element.toString());
     }
+
     /** Retrieve a metadata element by its fully qualified name.
      * @param name The elements name as a String.
      * @return An ElementWrapper containing the specied element, or <i>null</i> is no such element exists.
      */
+
     public ElementWrapper getElement(String name) {
     return getElement(name, false);
@@ -254 +224 @@
     String element = null;
     // First we seperate off what set it is in, where we have '<set><namespace_separator><element>'.
-    if(name.indexOf(NS_SEP) != -1) {
-        String namespace = name.substring(0, name.indexOf(NS_SEP));
+    if(name.indexOf(MSMUtils.NS_SEP) != -1) {
+        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(NS_SEP) + 1);
+        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
@@ -270 +240 @@
     if(set != null) {
         // 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(SF_SEP) != -1) {
-        StringTokenizer tokenizer = new StringTokenizer(element, SF_SEP);
+        if(element.indexOf(MSMUtils.SF_SEP) != -1) {
+        StringTokenizer tokenizer = new StringTokenizer(element, new Character(MSMUtils.SF_SEP).toString());
         // Has to be at least two tokens
         if(tokenizer.countTokens() >= 2) {
@@ -285 +255 @@
         tokenizer = null;
         }
-        // No subfields - much easier.
+        // No subelements - much easier.
         if(result == null) {
         ///ystem.err.print("Trying to match element " + element +"?");
@@ -299 +269 @@
     return result;
     }
+
     /** Retrieve a certain named element from a certain named set.
      * @param set The metadata set whose element you want.
@@ -312 +283 @@
     }
 
+
     /** Retrieve the named metadata set.
      * @param name The sets name as a String.
@@ -320 +292 @@
         return (MetadataSet) mds_hashtable.get(namespace);
     }
-//  else if(name.equals(HIDDEN)) {
-//      return createHidden();
-//  }
     return null;
     }
@@ -383 +352 @@
         //Now check our metadata.set's namespace to see if it is already loaded in all_sets
         for(int p = 0 ; p < i; p++) {
-  
-                if(metadata_set.getFile().compareTo(all_sets[p]) == 0) {
-                   // System.err.println("Not loading set: "+ metadata_set.getNamespace() + " is already loaded.\n");
-                   // JOptionPane.showMessageDialog(self, Dictionary.get("MEM.Cannot_Add_Elements_To_Greenstone_MDS"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
-                    gemsptr.warn_cant_load_set();
-                   
-                    return null; 
-                 }
-               
+        if(metadata_set.getFile().compareTo(all_sets[p]) == 0) {
+        gemsptr.warn_cant_load_set();
+        return null; 
+        }
         }
     
         //check if this metadata set belongs to a collection
-        //if so, then change the metadata set's name in the interface to (collection) dublic core...
-     // System.out.println(new String("asdfd" + metadata_set.getFile().separator));
+        //if so, then change the metadata set's name in the interface to (collection) dublin core...
     String sep = new String(metadata_set.getFile().separator);
-       StringTokenizer st = new StringTokenizer(metadata_set.getFile().toString(), sep);
-       String colName = new String("");
-       
+    StringTokenizer st = new StringTokenizer(metadata_set.getFile().toString(), sep);
+    String colName = new String("");
+    
         while ( st.hasMoreTokens() )
         {
            if(st.nextToken().compareTo("collect") == 0) {
-            colName = st.nextToken();  
-           // metadata_set.old_filename = metadata_set.getName();
-           // metadata_set.setName(new String("(" + colName + ") " + metadata_set.getName()) );
-            break;
+           colName = st.nextToken();  
+           break;
            }   
         }
 
-        //Actual set loading code(if it gets this far-Attila
-    //**************
-    //mds_hashtable.put(metadata_set.getNamespace(), metadata_set);
     if (colName.equals("")) {
-        //mds_hashtable.put(colName+":"+metadata_set.getNamespace(), metadata_set);
         mds_hashtable.put(metadata_set.getNamespace(), metadata_set);
     } else {
@@ -423 +380 @@
     return metadata_set;
     }
+
 
     /**
@@ -449 +407 @@
 
 
- /**
+    /**
        Rename the metadata element.
        @param oldElement An <strong>ElementWrapper</strong> we wish to rename
@@ -471 +429 @@
     }
 
-/*Following write() and write() and save() were taken from msm/metadatasetmanager.java and converted to 
- *the gems standard
- */
+
+    /*Following write() and write() and save() were taken from msm/metadatasetmanager.java and converted to 
+     *the gems standard
+     */
      private void write(ElementWrapper element, GValueModel model, String etc_dir) {
     try {
@@ -503 +462 @@
     w.write(buffer, 0, buffer.length);
     }
- public void save() {
-     // Create the correct file to save these sets to...
-     //File file = new File(Gatherer.self.getCollectionMetadata());
-     //File file = new File(GEMS.config.gsdl_path + "/gli/metadata");
-     File file = new File(Utility.METADATA_DIR);
-
-     
-     if (!file.exists()) {
-     //DebugStream.println("trying to save a collection and the metadata directory does not exist - creating it!");
-     System.out.println("trying to save a collection and the metadata directory does not exist - creating it!");
-     
-     file.mkdir();
-     }
-     // And make back ups of all existing metadata set files.
-     File temp[] = file.listFiles();
-     
-     //Null ptr exception here? Didnt see it, -Attila
-     /*for(int i = temp.length - 1; i >= 0; i--) {
-     // System.out.println("Itter: " + i);
-     if(temp[i].getName().endsWith(".mds") ) {
-     File backup = new File(temp[i].getAbsolutePath() + "~bak");
-                
-                //System.out.println(temp[i].getAbsolutePath()+ "asdf\n backupfile:"+ backup.toString());
-                
-                
-        //backup.deleteOnExit();
-               
-        if(!temp[i].renameTo(backup)) {
-            DebugStream.println("Error in MetadataSetManager.save(): FileRenamedException");
-                    System.out.println("Error in MetadataSetManager.save(): FileRenamedException");
-        }
-        }
-    }*/
-     // Now save the latest versions of the metadata sets.
-     for(Enumeration keys = mds_hashtable.keys(); keys.hasMoreElements(); ) {
-     String namespace = (String) keys.nextElement();
-     MetadataSet set = (MetadataSet) mds_hashtable.get(namespace);
-            //
-            //col_man.loadCollection(GEMS.config.getString("general.open_collection",true));
-            //
-     try {
-         // this won't work if we have collection metadata open
-         //File mds_file = new File(file, set.getNamespace() + ".mds");
-                
-                //set.setName(set.old_filename);
-                
-                //set has not changed(or has been recently saved
-              
-             
-             /*
-                if(set.getSetChanged() == false){
-                  continue;   
-                }*/
-                
-         // just use the existing file path
-         File mds_file = set.getFile();
-                //System.out.println(mds_file.toString() + "a\n");
-               //Saves the DOM obj that set.getDocument returns to mds_file name
-               // set.getF
-               // System.out.println(keys.toString());
-                
-               
-            // System.out.println("::: " + mds_file.toString());
-         XMLTools.writeXMLFile(mds_file, set.getDocument());
-             
-             set.setSetChanged(false);
-         //What does setfile do?
-         //set.setFile(mds_file);
-         //}
-        // Now for each element attempt to save its value tree.
-        //NodeList elements = set.getElements();
-        //for(int i = elements.getLength() - 1; i >= 0; i--) {
-          //  ElementWrapper value_element = new ElementWrapper((Element)elements.item(i));
-            //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()) {
-                //System.out.println("Val Tree: " +value_file.toString() + "\n");
-                               // value_element.
-                               // System.out.println(col_man.getCollectionEtc() + "<--getColEtc\n");
-                          //      write(value_element, value_tree, new String("/home/arosmain/gsdl/gli/"));
-                //}
-            //}
-            //}
-                    //System.out.println("Val element: "+value_element.toString() + "\n");
-        //}
+
+    public void save() {
+    File file = new File(Utility.METADATA_DIR);
+       
+    if (!file.exists()) {
+        System.out.println("trying to save a collection and the metadata directory does not exist - creating it!");
+        
+        file.mkdir();
+    }
+    // And make back ups of all existing metadata set files.
+    File temp[] = file.listFiles();
+    
+    // Now save the latest versions of the metadata sets.
+    for(Enumeration keys = mds_hashtable.keys(); keys.hasMoreElements(); ) {
+        String namespace = (String) keys.nextElement();
+        MetadataSet set = (MetadataSet) mds_hashtable.get(namespace);
+        try {
+        // just use the existing file path
+        File mds_file = set.getFile();
+        XMLTools.writeXMLFile(mds_file, set.getDocument());
+        set.setSetChanged(false);
         }
         catch (Exception error) {
@@ -598 +488 @@
         }
     }
-    //profiler.save();
-    }
+    }
+    
     public void removeSet(MetadataSet set) {
     mds_hashtable.remove(set.getNamespace());
         File f =  set.getFile();
         f.delete();
-        //System.out.println(f.toString() + Utility.METADATA_DIR);
-    // fireSetChanged(set);
     }
 }