Changeset 18610

Timestamp:

02.03.2009 15:11:40 (11 years ago)

Author:

kjdon

Message:

some indenting change, and set build type after changing the indexes instead of before otherwise be can't tell what our current build type was

Files:

• gli/trunk/src/org/greenstone/gatherer/cdm/IndexManager.java (modified) (5 diffs)

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

@@ -123 +123 @@
         mg_to_mgpp = false;
     }
-    build_type  = new_build_type;
     if (mg_to_mgpp) {
         changeToMGPPIndexes();
@@ -129 +128 @@
         changeToMGIndexes();
     }
+    build_type  = new_build_type;
     // its really hard to transfer defaults between mgpp/lucene and mg indexes, so we'll just set the first one to be the default
     Index first_index = (Index) getElementAt(0);
@@ -141 +141 @@
     mg_element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.TRUE_STR);
     NodeList indexes = mg_element.getElementsByTagName(StaticStrings.INDEX_ELEMENT);
-    if(indexes.getLength() != 0) {
-        //just reinstate what we had previously
-        setRoot(mg_element);
-    } else {
-        // If mg element has no indexes, and the current mgpp index includes a text one, then generate text indexes for each of the registered levels.
-        Index index = getIndex(StaticStrings.TEXT_STR);
-        if(index != null) {
-        // Replace mgpp element with mg element
-        setRoot(mg_element);
-        ArrayList levels = CollectionDesignManager.index_manager.getLevels();
-        int level_size = levels.size();
-        for(int i = 0; i < level_size; i++) {
-            IndexOption level = (IndexOption) levels.get(i);
-            Index new_index = new Index(level.getName(), index.getSources());
-            // Try to retrieve existing metadatum
-            String source_str = new_index.getID();
-            CollectionMeta metadatum = CollectionDesignManager.collectionmeta_manager.getMetadatum(StaticStrings.STOP_CHARACTER + source_str, false);
-            // If no metadata was found, add new pseudo metadata using the id
-            if(metadatum == null) {
-            metadatum = new CollectionMeta(StaticStrings.STOP_CHARACTER + source_str);
-            metadatum.setAssigned(true);
-            metadatum.setValue(source_str);
-            }
-            // If it was found, ensure it is assigned
-            else {
-            metadatum.setAssigned(true);
-            }
-            source_str = null;
-            addIndex(new_index, metadatum);
-            new_index = null;
-            level = null;
-        }
-        }
+    // Replace mgpp element with mg element
+    setRoot(mg_element);
+    
+    if(indexes.getLength() == 0) {
+      // we need to create some based on the mgpp indexes
+      
+      // If the current mgpp index includes a text one, then generate text indexes for each of the registered levels.
+      Index index = getIndex(StaticStrings.TEXT_STR);
+      if(index != null) {
+        ArrayList levels = CollectionDesignManager.index_manager.getLevels();
+        int level_size = levels.size();
+        for(int i = 0; i < level_size; i++) {
+          IndexOption level = (IndexOption) levels.get(i);
+          Index new_index = new Index(level.getName(), index.getSources());
+          // Try to retrieve existing metadatum
+          String source_str = new_index.getID();
+          CollectionMeta metadatum = CollectionDesignManager.collectionmeta_manager.getMetadatum(StaticStrings.STOP_CHARACTER + source_str, false);
+          // If no metadata was found, add new pseudo metadata using the id
+          if(metadatum == null) {
+        metadatum = new CollectionMeta(StaticStrings.STOP_CHARACTER + source_str);
+        metadatum.setAssigned(true);
+        metadatum.setValue(source_str);
+          }
+          // If it was found, ensure it is assigned
+          else {
+        metadatum.setAssigned(true);
+          }
+          source_str = null;
+          addIndex(new_index, metadatum);
+          new_index = null;
+          level = null;
+        }
+      }
     }
     
@@ -195 +195 @@
         
         ArrayList sources_list = new ArrayList();
+
         // We first use details from the default index if any
         if(default_index != null) {
@@ -245 +246 @@
         new_sources = null;
         source_str = null;
-        }
+        }         
         
     }