Changeset 19945 for gli

Timestamp:

2009-06-29T12:59:50+12:00 (15 years ago)

Author:

kjdon

Message:

changed how it was reading in gs3 config xml - the values weren't getting assigned to creator, name, desription etc variables

File:

• gli/trunk/src/org/greenstone/gatherer/collection/BasicCollectionConfiguration.java (modified) (2 diffs)

gli/trunk/src/org/greenstone/gatherer/collection/BasicCollectionConfiguration.java

@@ -38 +38 @@
 
 import java.io.*;
+import java.util.ArrayList;
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
@@ -164 +165 @@
         Element root = xml_file_doc.getDocumentElement();
 
-        Node metadataListNode = XMLTools.getChildByTagNameIndexed(root, StaticStrings.METADATALIST_STR, 0);
-        Node displayItemListNode = XMLTools.getChildByTagNameIndexed(root, StaticStrings.DISPLAYITEMLIST_STR, 0);
-        String []strings = {creator,
-                    maintainer,
-                    is_public,
-                    name,
-                    description};
-        String []att_names = {StaticStrings.COLLECTIONMETADATA_CREATOR_STR, 
-                      StaticStrings.COLLECTIONMETADATA_MAINTAINER_STR,
-                      StaticStrings.COLLECTIONMETADATA_PUBLIC_STR,
-                      StaticStrings.NAME_STR,
-                      StaticStrings.DESCRIPTION_STR};
-        for (int i=0; i<strings.length; i++) {  
-            Element e = XMLTools.getNamedElement((Element)metadataListNode, 
-                StaticStrings.METADATA_STR, StaticStrings.NAME_ATTRIBUTE, att_names[i]);
-            if (i >=3) {
-            e = XMLTools.getNamedElement((Element)displayItemListNode, 
-                  StaticStrings.DISPLAYITEM_STR, StaticStrings.NAME_ATTRIBUTE, att_names[i]);
+        Node metadataListNode = XMLTools.getChildByTagName(root, StaticStrings.METADATALIST_STR);
+        Node displayItemListNode = XMLTools.getChildByTagName(root, StaticStrings.DISPLAYITEMLIST_STR);
+
+        if (metadataListNode != null) {
+          ArrayList metadata_list = XMLTools.getChildElementsByTagName((Element)metadataListNode, StaticStrings.METADATA_STR);
+          for (int i=0; i<metadata_list.size(); i++) {
+            Element meta = (Element) metadata_list.get(i);
+            String meta_name = meta.getAttribute(StaticStrings.NAME_ATTRIBUTE);
+            if (meta_name.equals(StaticStrings.COLLECTIONMETADATA_CREATOR_STR)) {
+              creator = XMLTools.getNodeText(meta);
+            } else if (meta_name.equals(StaticStrings.COLLECTIONMETADATA_MAINTAINER_STR)) {
+              maintainer = XMLTools.getNodeText(meta);
+            } else if (meta_name.equals(StaticStrings.COLLECTIONMETADATA_PUBLIC_STR)) {
+              is_public = XMLTools.getNodeText(meta);
             }
-            if (e == null) {
-            continue;
-            }
-            strings[i] = XMLTools.getNodeText(e);
+          }
+          
         }
-
+        if (displayItemListNode != null) {
+          ArrayList display_list = XMLTools.getChildElementsByTagName((Element)displayItemListNode, StaticStrings.DISPLAYITEM_STR);
+          for (int i=0; i<display_list.size(); i++) {
+            Element meta = (Element) display_list.get(i);
+            String meta_name = meta.getAttribute(StaticStrings.NAME_ATTRIBUTE);
+            if (meta_name.equals(StaticStrings.NAME_STR)) {
+              name = XMLTools.getNodeText(meta);
+            } else if (meta_name.equals(StaticStrings.DESCRIPTION_STR)) {
+              description = XMLTools.getNodeText(meta);
+            } 
+            
+          }
+        }
         }
+        
     }
     catch(Exception error) {