Changeset 5852

Timestamp:

2003-11-14T16:56:23+13:00 (20 years ago)

Author:

kjdon

Message:

fixed the annoying null pointer exception when there was an empty indexes line

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java

@@ -568 +568 @@
     /** Retrieve or create the indexes Element. */
     private Element getOrCreateElementByTagName(String name, String conditional_attribute, String required_value) {
-    ///ystem.err.println("Get or create element by tag name: " + name);
     Element document_element = document.getDocumentElement();
     NodeList elements = document_element.getElementsByTagName(name);
@@ -618 +617 @@
     }
     NodeList index_elements = command_element.getElementsByTagName(INDEX_ELEMENT);
+    if (index_elements.getLength() == 0) { // no indexes
+        return "";
+    }
     // For each index, write its level, a colon, then concatenate its child content elements into a single comma separated list
     int index_elements_length = index_elements.getLength();
@@ -889 +891 @@
             command_element = document.createElement(UNKNOWN_ELEMENT);
             MSMUtils.setValue(command_element, command_str);
-            }
+           }
         }
         // Or an empty line to remember for later
@@ -1038 +1040 @@
         StringTokenizer tokenizer = new StringTokenizer(command_str);
         String command = tokenizer.nextToken();
-        if(tokenizer.hasMoreTokens()) {
-        command_element = document.createElement(INDEXES_ELEMENT);
-        }
+        command_element = document.createElement(INDEXES_ELEMENT);
         command_element.setAttribute(ASSIGNED_ATTRIBUTE, (command.equals(INDEX_STR) ? TRUE_STR : FALSE_STR));
         command = null;
+        if(!tokenizer.hasMoreTokens()) {
+        
+        // there are no indexes
+        command_element.setAttribute(ASSIGNED_ATTRIBUTE, FALSE_STR);
+        command_element.setAttribute(MGPP_ATTRIBUTE, FALSE_STR); // for now
+        tokenizer = null;
+        return command_element;
+        }
+        
         while(tokenizer.hasMoreTokens()) {
         Element index_element = document.createElement(INDEX_ELEMENT);