Changeset 4674

Timestamp:

2003-06-16T10:44:18+12:00 (21 years ago)

Author:

jmt12

Message:

* empty log message *

Location:

trunk/gli

Files:

• classes/xml/associations.xml (added)
• src/org/greenstone/gatherer/msm/GDMDocument.java (modified) (11 diffs)
• src/org/greenstone/gatherer/msm/GDMManager.java (modified) (9 diffs)
• src/org/greenstone/gatherer/msm/MetadataSetManager.java (modified) (2 diffs)
• src/org/greenstone/gatherer/util/DefaultSynchronizedTreeNode.java (added)
• src/org/greenstone/gatherer/util/DragTreeSelectionModel.java (modified) (13 diffs)
• src/org/greenstone/gatherer/util/EmailAddress.java (modified) (1 diff)
• src/org/greenstone/gatherer/util/SynchronizedTreeModel.java (added)
• src/org/greenstone/gatherer/util/SynchronizedTreeNode.java (added)
• src/org/greenstone/gatherer/util/TreeModelTest.java (added)

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

@@ -36 +36 @@
 import org.greenstone.gatherer.valuetree.GValueNode;
 import org.w3c.dom.*;
-/** This class wraps around a DOM Document providing methods for accessing the data within. In this case the DOM represents a Greenstone Directory metadata file. It provides the necessary functionality to create a new metadata.xml file. 
+/** This class wraps around a DOM Document providing methods for accessing the data within. In this case the DOM represents a Greenstone Directory metadata file. It provides the necessary functionality to create a new metadata.xml file.
  * @author John Thompson, Greenstone Digital Library, University of Waikato
  * @version 2.3b
@@ -150 +150 @@
         for(int l = 0; !will_accumulate && l < sibling_metadata_elements.getLength(); l++) {
             Element sibling_metadata_element = (Element) sibling_metadata_elements.item(l);
-            will_accumulate = sibling_metadata_element.getAttribute(NAME_ATTRIBUTE).equals(metadata_element.getAttribute(NAME_ATTRIBUTE));
+            // It appears that its possible that we can be asked to add the same metadata twice (especially after a copy action is cancelled then repeated). So we check if we have been asked to add exactly the same value twice.
+            if(sibling_metadata_element.getAttribute(NAME_ATTRIBUTE).equals(metadata_element.getAttribute(NAME_ATTRIBUTE))) {
+                // Check the values and return if they are the same.
+                //if(metadata_element.getAttribute(NAME_ATTRIBUTE).equalsIgnoreCase("dls.Title")) {
+                //  Gatherer.println("Comparing:");
+                //  Gatherer.println("'" + metadata.getAbsoluteValue() + "'");
+                //  Gatherer.println(" with:");
+                //  Gatherer.println("'" + MSMUtils.getValue(sibling_metadata_element) + "'");
+                //}
+                if(metadata.getAbsoluteValue().equals(MSMUtils.getValue(sibling_metadata_element))) {
+                //  Gatherer.println("Value already exists: " + metadata);
+                    return;
+                }
+                will_accumulate = true;
+            }
             sibling_metadata_element = null;
         }
@@ -187 +201 @@
     }
     /** Get all of the metadata, including directory level, associated with this file. */
-    public ArrayList getMetadata(String filename, boolean remove, ArrayList metadatum_so_far, File file) {
-    return getMetadata(filename, remove, metadatum_so_far, file, false);
+    public ArrayList getMetadata(String filename, boolean remove, ArrayList metadatum_so_far, File file, boolean append_folder_level) {
+    return getMetadata(filename, remove, metadatum_so_far, file, append_folder_level, false);
     }
     /** Retrieve the metadata associated with the given filename. Keep track of what metadata should be overwritten and what should be accumulated. Also make note of the source file, and remove the metadata if required. Finally if purge is set retrieve every piece of metadata in this file. */
-    public ArrayList getMetadata(String filename, boolean remove, ArrayList metadatum_so_far, File file, boolean purge) {
+    public ArrayList getMetadata(String filename, boolean remove, ArrayList metadatum_so_far, File file, boolean append_folder_level, boolean purge) {
     ///ystem.err.println("Get metadata for " + filename);
     ArrayList metadatum = null;
@@ -211 +225 @@
             Element filename_element = (Element) filename_elements.item(j);
             String filename_text = MSMUtils.getValue(filename_element);
-            if((filename != null && filename.matches(filename_text)) || filename_text.equals(DIRECTORY_FILENAME) || purge) {
+            if((filename != null && filename.matches(filename_text)) || ((filename == null || append_folder_level) && filename_text.equals(DIRECTORY_FILENAME)) || purge) {
             // If they match add all of the metadata found in the Description child element, remembering to abide by desired mode (accumulate vs. overwrite).
             NodeList description_elements = fileset_element.getElementsByTagName(DESCRIPTION_ELEMENT);
@@ -236 +250 @@
                     ElementWrapper element = Gatherer.c_man.getCollection().msm.getElement(raw_element);
                     if (element != null) {
-                    
+
                     GValueNode value = Metadata.getDefaultValueNode(element, raw_value);
                     ///ystem.err.println("Miss. Create new metadata: " + raw_element + " -> " + raw_value + "\n");
@@ -244 +258 @@
                     value = null;
                     element = null;
-                    } 
+                    }
                 }
                 // check whether the metadata is null
@@ -251 +265 @@
                     if(filename != null) {
                     ///ystem.err.println("Filename      = " + filename);
-                    ///ystem.err.println("filename_text = " + filename_text); 
+                    ///ystem.err.println("filename_text = " + filename_text);
                     // If can only be file level if there is no folder path details in filename and if the filename matched the filename text node (it may have matched .* instead)!
                     if(filename.indexOf(File.separator) == -1 && filename.equals(filename_text)) {
@@ -267 +281 @@
                     }
                     metadata.setFile(file);
-                    
+
                 // If mode is overwrite, then remove any previous values for this metadata element.
                     if(mode.equals("accumulate")) {
@@ -285 +299 @@
                     }
                     mode = null;
-                    
+
                 // Add the completed metadata and clean up
                 ///ystem.err.println("Adding metadata: " + metadata);
                     metadatum.add(metadata);
-                    
+
                 // Having found our metadata check if the value from the xml matches the one from the gvaluenode. If not update it. This happens whenever hierarchy information is involved (indexes rapidly become obsolete).
                 // If remove was set, remove it. We can only remove pure file level metadata, or folder level iff we were asked for folder level.
@@ -378 +392 @@
                 Element description_element = (Element) description_elements.item(k);
                 NodeList metadata_elements = description_element.getElementsByTagName("Metadata");
-                for(int l = 0; (!found || !make_next_metadata_element_overwrite) && l < metadata_elements.getLength(); l++) {       
+                for(int l = 0; (!found || !make_next_metadata_element_overwrite) && l < metadata_elements.getLength(); l++) {
                 Element metadata_element = (Element) metadata_elements.item(l);
                 String element = metadata_element.getAttribute("name");
@@ -428 +442 @@
         Gatherer.printStackTrace(error);
     }
-    }   
+    }
 
     /** Change the up to date flag. */

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

@@ -56 +56 @@
 */
 public class GDMManager
-    extends HashMap 
+    extends HashMap
     implements MSMListener {
     /** A list of the known metadata instances, thus we only store one of each unique metadata, and reference the rest. */
@@ -84 +84 @@
     }
     }
-    /** Destructor necessary for clean exit, subsequent to saving of metadata.xml files. 
+    /** Destructor necessary for clean exit, subsequent to saving of metadata.xml files.
       * @see org.greenstone.gatherer.Gatherer
       * @see org.greenstone.gatherer.collection.CollectionManager
@@ -154 +154 @@
     /** Recover the metadata associated with a particular file. Note that this call is synchronized, so that all of the data holders don't need to be. */
     public synchronized ArrayList getMetadata(File file) {
-    return getMetadata(file, false);
+    return getMetadata(file, false, true);
+    }
+
+/** Recover the metadata associated with a particular file excluding folder level metadata. Note that this call is synchronized, so that all of the data holders don't need to be. */
+    public synchronized ArrayList getMetadataOnly(File file) {
+    return getMetadata(file, false, false);
     }
 
     public synchronized ArrayList getMetadata(File file, ElementWrapper element) {
-    ArrayList metadata = getMetadata(file, false);
+    ArrayList metadata = getMetadata(file, false, true);
     ArrayList values = new ArrayList();
     for(int i = 0; i < metadata.size(); i++) {
@@ -172 +177 @@
     }
 
-    private ArrayList getMetadata(File file, boolean remove) {
+    private ArrayList getMetadata(File file, boolean remove, boolean append_folder_level) {
     ArrayList metadata = null;
     String filename = null;
@@ -181 +186 @@
     GDMDocument document = getDocument(file);
     if(document != null) {
-        metadata = document.getMetadata(filename, remove, metadata, file);
+        metadata = document.getMetadata(filename, remove, metadata, file, append_folder_level);
         document = null;
     }
@@ -221 +226 @@
         if(document != null) {
         // There is one piece of slight of hand here. You can never remove metadata during a get all metadata.
-        metadata = document.getMetadata(a_search.filename, false, metadata, a_search.file);
+        metadata = document.getMetadata(a_search.filename, false, metadata, a_search.file, true);
         ///ystem.err.println("Current metadata: " + toString(metadata));
         document = null;
@@ -233 +238 @@
     search_files = null;
     return metadata;
-    }  
+    }
 
     public String toString(ArrayList list) {
@@ -244 +249 @@
     }
     text.append(")");
-    return text.toString();       
+    return text.toString();
     }
 
@@ -300 +305 @@
 
     public ArrayList removeMetadata(File file) {
-    return getMetadata(file, true);
-    }
-
-    /** Causes all currently loaded GDMDocuments to write themselves out. 
+    return getMetadata(file, true, false);
+    }
+
+    /** Causes all currently loaded GDMDocuments to write themselves out.
       * @see org.greenstone.gatherer.msm.GDMDocument
       */

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

@@ -579 +579 @@
         mds_hashtable.put(family, mds_new);
         }
-        fireSetChanged(mds_new);
         return true;
     }
@@ -915 +914 @@
     // And make back ups of all existing metadata set files.
     File temp[] = file.listFiles();
-    for(int i = 0; temp != null && i < temp.length; i++) {
+    for(int i = temp.length - 1; i >= 0; i--) {
         if(temp[i].getName().endsWith(".mds") || temp[i].getName().endsWith(".mdv")) {
         File backup = new File(temp[i].getAbsolutePath() + "~");

trunk/gli/src/org/greenstone/gatherer/util/DragTreeSelectionModel.java

@@ -70 +70 @@
     tree.addMouseListener(this);
     }
-     
+
     public void addSelectionPath(TreePath path) {
     if(!immediate) {
@@ -81 +81 @@
     }
     }
-     
+
     public void addSelectionPaths(TreePath paths[]) {
     if(!immediate) {
@@ -90 +90 @@
         temp_paths = null;
         super.setSelectionPaths(paths);
-    }         
-    }
-     
+    }
+    }
+
     public String getDetails() {
     String suffix = null;
@@ -154 +154 @@
     return suffix;
     }
-     
+
     /** Any implementation of MouseListener must include this method so
      * we can be informed when the mouse is clicked.
@@ -162 +162 @@
     public void mouseClicked(MouseEvent event) {
     }
-     
+
     /** Any implementation of MouseListener must include this method so
      * we can be informed when the mouse enters a component.
@@ -170 +170 @@
     public void mouseEntered(MouseEvent event) {
     }
-     
+
     /** Any implementation of MouseListener must include this method so
      * we can be informed when the mouse exits a component.
@@ -178 +178 @@
     public void mouseExited(MouseEvent event) {
     }
-     
+
     /** Any implementation of MouseListener must include this method so
      * we can be informed when the mouse is pressed (start of click).
@@ -193 +193 @@
      */
     public void mouseReleased(MouseEvent event) {
+    try {
     switch(this.type) {
     case 0: // this.ADD
@@ -217 +218 @@
         break;
     }
+    }
+    catch (Exception error) {
+        Gatherer.printStackTrace(error);
+    }
     }
 
@@ -222 +227 @@
     immediate = value;
     }
-     
+
     public void setSelectionPath(TreePath path) {
     // Since this is only a single path we don't need to check whether its an appropriate selection.
@@ -234 +239 @@
     }
     }
-     
+
     public void setSelectionPaths(TreePath paths[]) {
     if(!immediate) {
@@ -246 +251 @@
     }
 
-    /** Ensure that the given path is appropriate to add to the current selection, preventing mixed selections of files and folder if required. We also must check that no path is a ancestor/descendant of another. 
+    /** Ensure that the given path is appropriate to add to the current selection, preventing mixed selections of files and folder if required. We also must check that no path is a ancestor/descendant of another.
      */
     private boolean isAppropriate(TreePath path) {
@@ -256 +261 @@
         TreeNode current_node = (TreeNode) selection[i].getLastPathComponent();
         appropriate = appropriate && (mixed_selection || new_node.isLeaf() == current_node.isLeaf());
-        appropriate = appropriate && !path.isDescendant(selection[i]) && !selection[i].isDescendant(path);      
+        appropriate = appropriate && !path.isDescendant(selection[i]) && !selection[i].isDescendant(path);
         }
     }

trunk/gli/src/org/greenstone/gatherer/util/EmailAddress.java

@@ -204 +204 @@
         middle = new JPanel();
         field1 = new JTextField(user);
-        field1.setBackground(Gatherer.config.getColor("coloring.editable", false));
+        field1.setBackground(Color.white);
         at = new JLabel("@");
         field2 = new JTextField(host);
-        field2.setBackground(Gatherer.config.getColor("coloring.editable", false));
+        field2.setBackground(Color.white);
                 // Add listeners
         field1.addKeyListener(new UserListener());