Changeset 6639

Timestamp:

2004-01-28T14:47:07+13:00 (20 years ago)

Author:

jmt12

Message:

Prevent hand entered section metadata being extracted in the same way that the top level metadata is

File:

• trunk/gli/src/org/greenstone/gatherer/msm/GreenstoneArchiveParser.java (modified) (2 diffs)

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

@@ -108 +108 @@
         String file_path = null;
         Element archive_element = document.getDocumentElement();
+        // Retrieve the initial Section element
+        NodeList section_elements = archive_element.getElementsByTagName(StaticStrings.SECTION_ELEMENT);
+        // It may be the case that we have some sort of mutant freak archive file which doesn't have any section elements.
+        if(section_elements.getLength() < 1) {
+        return count; 
+        }
+        Element section_element = (Element) section_elements.item(0);       
+        section_elements = null;
         // Retrieve all of the Metadata sections.
-        NodeList metadata_elements = archive_element.getElementsByTagName("Metadata");
+        NodeList metadata_elements = section_element.getElementsByTagName(StaticStrings.METADATA_ELEMENT);
+        section_element = null;
         // We first zip through the retrieved metadata, and if we encounter the element 'SourceSegment' - a sure sign this collection came from a bibliographic type file - we break out of extracted metadata parsing as no sense could be made of the data extracted anyway (plus we suffer a death of thirty-thousand pointy bits of metadata!)
         for(int i = 0; i < metadata_elements.getLength(); i++) {
         Element metadata_element = (Element) metadata_elements.item(i);
-        String name = metadata_element.getAttribute("name");
+        String name = metadata_element.getAttribute(StaticStrings.NAME_ATTRIBUTE);
         if(name.equalsIgnoreCase(StaticStrings.SOURCESEGMENT_VALUE)) {
             return 0;
@@ -121 +130 @@
         for(int i = 0; i < metadata_elements.getLength(); i++) {
         Element metadata_element = (Element) metadata_elements.item(i);
-        String name = metadata_element.getAttribute("name");
+        String name = metadata_element.getAttribute(StaticStrings.NAME_ATTRIBUTE);
         // There is also a special case when the metadata name is gsdlsourcefilename, as we use this to find the FileRecord we want to add metadata to.
         if(name.equals("gsdlsourcefilename")) {