Changeset 6348

Timestamp:

2004-01-06T11:45:26+13:00 (20 years ago)

Author:

cs025

Message:

Minor layout changes; small functional extensions with lookup functions

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata

Files:

• METSDescriptive.java (modified) (1 diff)
• METSStructure.java (modified) (1 diff)

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/METSDescriptive.java

@@ -164 +164 @@
     return accumulatedValues;
   }
-
-    /**
-     *  Parse an XML Element as a METS Descriptive Metadata section
-     *
-     *  @param <code>Element</code> the XML element which represents the dmdSec itself
-     */
-    public static METSDescriptive parseXML(Element element)
-    {   // Note: no parsing of attributes required, we just move onto the metadata
-      //       namespaces/sections themselves
-        String ID = element.getAttribute("ID");
-        String label = element.getAttribute("GROUPID");
-        METSDescriptive thisDescriptive = new METSDescriptive(ID, label);
-
-        NodeList children = element.getChildNodes();
-        
-        for (int c = 0; c < children.getLength(); c ++)
-        { if (children.item(c).getNodeType() != org.w3c.dom.Node.ELEMENT_NODE) {
-                continue;
-            }
-
-            Element childElement = (Element) children.item(c);
-            if (childElement.getNodeName().equals("mets:mdRef"))
-            {   METSNamespace namespace = NamespaceFactory.parseXML(element);
-            }
-            else if (childElement.getNodeName().equals("mets:mdWrap"))
-            {   METSNamespace namespace = NamespaceFactory.parseXML(element);
-            }
-            else
-            {   // TODO: raise an error!
-            }
-        }
-        return thisDescriptive;
-    }
+  
+  /**
+   *  Parse an XML Element as a METS Descriptive Metadata section
+   *
+   *  @param <code>Element</code> the XML element which represents the dmdSec itself
+   */
+  public static METSDescriptive parseXML(Element element)
+  { // Note: no parsing of attributes required, we just move onto the metadata
+    //       namespaces/sections themselves
+    String ID = element.getAttribute("ID");
+    String label = element.getAttribute("GROUPID");
+    METSDescriptive thisDescriptive = new METSDescriptive(ID, label);
+    
+    NodeList children = element.getChildNodes();
+    
+    for (int c = 0; c < children.getLength(); c ++)
+    { if (children.item(c).getNodeType() != org.w3c.dom.Node.ELEMENT_NODE) {
+        continue;
+      }
+
+      Element childElement = (Element) children.item(c);
+      if (childElement.getNodeName().equals("mets:mdRef"))
+      { METSNamespace namespace = NamespaceFactory.parseXML(element);
+      }
+      else if (childElement.getNodeName().equals("mets:mdWrap"))
+      { METSNamespace namespace = NamespaceFactory.parseXML(element);
+      }
+      else
+      { // TODO: raise an error!
+      }
+    }
+    return thisDescriptive;
+  }
 
 

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/METSStructure.java

@@ -158 +158 @@
       else 
       { results = null;
+      }
+      
+      if (results != null) {
+    results.close();
       }
     }