Changeset 8971 for trunk/gli/src/org/greenstone/gatherer/gems/MetadataSetManager.java

Timestamp:

2005-02-07T10:36:51+13:00 (19 years ago)

Author:

mdewsnip

Message:

More GEMS fixes, by Matthew Whyte. Can now create subelements of subelements.

File:

• trunk/gli/src/org/greenstone/gatherer/gems/MetadataSetManager.java (modified) (5 diffs)

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

@@ -405 +405 @@
            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()) );
@@ -431 +430 @@
        @return void
        Modified by Matthew Whyte 19/01/04
+
+       This should really be totally replaced by MetadataSet.removeElement --Matthew
      */
     public void removeElement(ElementWrapper element, ElementWrapper parent) {
@@ -439 +440 @@
     if(set != null) {
         //Remove the element
-        if(parent == null)
-        {
-            set.removeElement(element.getElement(), null); //Let's not cause an exception!
-        }
-        else
-        {
-            set.removeElement(element.getElement(), parent.getElement());
-        }
+        set.removeElement(element.getElement(), parent);
     }
     else {
@@ -463 +457 @@
     public void renameElement(ElementWrapper oldElement, String newName)
     {
-    GEMSNode node = null;
-
     //Retrive the metadata set this element belongs to.
     String namespace = oldElement.getNamespace();
@@ -491 +483 @@
         for(int i = 0; i < all_values.size(); i++) {
         GValueNode node = (GValueNode)all_values.get(i);
-        TreePath path = new TreePath(node.getPath());
         String full_value = node.getFullPath(false);
         String index = model.getHIndex(full_value);