Changeset 8863

Timestamp:

2004-12-20T17:27:38+13:00 (19 years ago)

Author:

kjdon

Message:

Matthew's changes - fixed up hashtable keys

Location:

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

Files:

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

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

@@ -467 +467 @@
     public void removeElement(Element element) {
     // we need to remove the value tree too!!
-    removeValueTree(new ElementWrapper(element));
-    root.removeChild(element);
+    //System.err.println("removeElement in MetadataSet: element is: " + element); //Debug
+
+    try {
+        removeValueTree(new ElementWrapper(element));
+        root.removeChild(element);
+
+    } catch(Exception DOMException) { //The element does not exist!!
+        System.err.println("Exception: '"+ DOMException + "' occured. Cannot remove element because it does not exist.");
+    }
     }
     /** Used to remove the value tree for a specific element.

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

@@ -374 +374 @@
            if(st.nextToken().compareTo("collect") == 0) {
             colName = st.nextToken();  
+        System.err.println("colName is: " + colName); //debug
            // metadata_set.old_filename = metadata_set.getName();
            // metadata_set.setName(new String("(" + colName + ") " + metadata_set.getName()) );
@@ -384 +385 @@
     //mds_hashtable.put(metadata_set.getNamespace(), metadata_set);
     if (colName.equals("")) {
-        mds_hashtable.put(colName+":"+metadata_set.getNamespace(), metadata_set);
+        //mds_hashtable.put(colName+":"+metadata_set.getNamespace(), metadata_set);
+        mds_hashtable.put(metadata_set.getNamespace(), metadata_set);
     } else {
         metadata_set.setCollection(colName);
@@ -401 +403 @@
         String old_name = element.toString();
         // Remove the element.
+        
         set.removeElement(element.getElement());
     }