Changeset 36139 for main

Timestamp:

2022-04-12T11:07:08+12:00 (2 years ago)

Author:

kjdon

Message:

updated to use the new MGIndex/Index classes. a bit of code refactoring to reduce duplication

File:

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

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

@@ -70 +70 @@
     public IndexManager(Element indexes, String current_build_type) {
 
-    super(indexes, StaticStrings.INDEX_ELEMENT, new Index());
+    super(indexes, StaticStrings.INDEX_ELEMENT, (current_build_type.equals(BuildTypeManager.BUILD_TYPE_MG)?new MGIndex():new Index()));
     DebugStream.println("IndexManager: " + getSize() + " indexes parsed.");
     index_model = this;
       
-       
     // Parse and retrieve the default index
     NodeList default_index_elements = CollectionConfiguration.getElementsByTagName(StaticStrings.INDEX_DEFAULT_ELEMENT);
     if(default_index_elements.getLength() > 0) {
-                 
-        default_index = new Index((Element)default_index_elements.item(0));
+        if (current_build_type.equals(BuildTypeManager.BUILD_TYPE_MG)) {
+        default_index = new MGIndex((Element)default_index_elements.item(0));
+        } else {
+        default_index = new Index((Element)default_index_elements.item(0));
+        }
     }
     build_type = current_build_type;
@@ -136 +138 @@
     
     private void changeToMGIndexes() {
+    this.setClassType(new MGIndex());
     Element mgpp_element = root;
     // Retrieve and assign MG element and default index element
@@ -154 +157 @@
         for(int i = 0; i < level_size; i++) {
           IndexOption level = (IndexOption) levels.get(i);
-          Index new_index = new Index(level.getName(), index.getSources());
+          Index new_index = new MGIndex(level.getName(), index.getSources());
           // Try to retrieve existing metadatum
           String source_str = new_index.getID();
@@ -183 +186 @@
 
     private void changeToMGPPIndexes() {
+    this.setClassType(new Index());
     Element mg_element = root;
     // Retrieve and assign the MGPP indexes element.
@@ -397 +401 @@
         if(default_index == null) {
         // Create the default index element, and place immediately after indexes element.
-        Element default_index_element = root.getOwnerDocument().createElement(StaticStrings.INDEX_DEFAULT_ELEMENT);               
-        default_index = new Index(default_index_element);
+        Element default_index_element = root.getOwnerDocument().createElement(StaticStrings.INDEX_DEFAULT_ELEMENT);             
+        if (build_type.equals(BuildTypeManager.BUILD_TYPE_MG)) {
+            default_index = new MGIndex(default_index_element);
+        } else {
+            default_index = new Index(default_index_element);
+        }
         Node target_node = CollectionConfiguration.findInsertionPoint(default_index_element);
         if(target_node != null) {
@@ -406 +414 @@
             root.getOwnerDocument().getDocumentElement().appendChild(default_index_element);
         }
+        } else {
+        if (build_type.equals(BuildTypeManager.BUILD_TYPE_MG) &&! (default_index instanceof org.greenstone.gatherer.cdm.MGIndex)) {
+            default_index = new MGIndex(default_index.getElement());
+        } else if (!build_type.equals(BuildTypeManager.BUILD_TYPE_MG) && default_index instanceof org.greenstone.gatherer.cdm.MGIndex) {
+            default_index = new Index(default_index.getElement());
+        }
         }
         default_index.setAssigned(true);
-        default_index.setLevel(index.getLevel());
         default_index.setSources(index.getSources());
+        if (build_type.equals(BuildTypeManager.BUILD_TYPE_MG)) {
+        ((MGIndex)default_index).setLevel(((MGIndex)index).getLevel());
+        }
         
     }
@@ -847 +863 @@
             } 
             if (!mgpp_enabled) {
-            level_combobox.setSelectedIndex(existing_index.getLevel());
+            level_combobox.setSelectedIndex(((MGIndex)existing_index).getLevel());
             }
             
@@ -894 +910 @@
             index = new Index(sources);
             } else {
-            index = new Index(level_combobox.getSelectedIndex(), sources);
+            index = new MGIndex(level_combobox.getSelectedIndex(), sources);
             }
         } else {
@@ -911 +927 @@
         
         }
+
+        private Index generateNewIndex() {
+        Index index = null;
+        ArrayList sources;
+        if (mgpp_enabled && allfields_box.isSelected()) {
+            sources = new ArrayList();
+            sources.add(ALLFIELDS);
+            index = new Index(sources);
+        }
+        else if (text_checkbox.isSelected() || !source_list.isNothingTicked()) {
+            sources = source_list.getTicked();
+            if (text_checkbox.isSelected()) {
+            sources.add(0, StaticStrings.TEXT_STR);
+            }
+            if(mgpp_enabled) {
+            index = new Index(sources);
+            } else {
+            index = new MGIndex(level_combobox.getSelectedIndex(), sources);
+            }
+        }
+        return index;
+         
+
+        }
+        
+        private CollectionMeta generateCollectionMeta(Index index) {
+        CollectionMeta metadatum = new CollectionMeta(StaticStrings.STOP_CHARACTER + index.getID());
+        if (use_macro_as_display_name(index.getID())) {
+            metadatum.setValue(get_macro_name(index.getID()));
+        } else {
+            metadatum.setValue(index.getID());
+        }
+        return metadatum;
+        }
+        
         private class AddIndexListener
         implements ActionListener
@@ -916 +967 @@
         public void actionPerformed(ActionEvent event)
         {
-            Index index;
-            if (mgpp_enabled && allfields_box.isSelected()) {
-            ArrayList sources = new ArrayList();
-            sources.add(ALLFIELDS);
-            index = new Index(sources);
+            Index index = generateNewIndex();
+            if (index != null) {
+            
+            CollectionMeta metadatum = generateCollectionMeta(index);
+            // Add the index
+            addIndex(index, metadatum);
+            index_list.setSelectedValue(index, true);
             }
-            else if (text_checkbox.isSelected() || 
-                 !source_list.isNothingTicked()) {
-            ArrayList sources = source_list.getTicked();
-            if (text_checkbox.isSelected()) {
-                sources.add(0, StaticStrings.TEXT_STR);
-            }
-            if(mgpp_enabled) {
-                index = new Index(sources);
-            } else {
-                index = new Index(level_combobox.getSelectedIndex(), sources);
-            }
-            } else {
-            return;
-            }
-         
-            // Before we add the index to the model, we have to add a default collection metadata for this
-            CollectionMeta metadatum = new CollectionMeta(StaticStrings.STOP_CHARACTER + index.getID());
-            if (use_macro_as_display_name(index.getID())) {
-            metadatum.setValue(get_macro_name(index.getID()));
-            } else {
-            metadatum.setValue(index.getID());
-            }
-        
-            // Finally, add the index
-            addIndex(index, metadatum);
-            index_list.setSelectedValue(index, true);
-            new_index_prompt.dispose();
+            new_index_prompt.dispose();         
         }
         }
@@ -1018 +1045 @@
         implements ActionListener {
         
-        public void actionPerformed(ActionEvent event) {
-        
-            ArrayList sources;
-            Index index = null;
-            if (text_checkbox.isSelected() || !source_list.isNothingTicked()) {
-            sources = source_list.getTicked();
-            if (text_checkbox.isSelected()) {
-                sources.add(0, StaticStrings.TEXT_STR);
-            }
-            if (mgpp_enabled) {
-                index = new Index(sources);
-            } else {
-                index = new Index(level_combobox.getSelectedIndex(), sources);
-            }
-            }
+        public void actionPerformed(ActionEvent event)
+        {
+            Index index = generateNewIndex();
             if (index != null) {
-            // Create the new collection meta
-            CollectionMeta metadatum = new CollectionMeta(StaticStrings.STOP_CHARACTER + index.getID());
-            if (use_macro_as_display_name(index.getID())) {
-                metadatum.setValue(get_macro_name(index.getID()));
-            } else {
-                metadatum.setValue(index.getID());
-            }
-            
+            CollectionMeta metadatum = generateCollectionMeta(index);
             // replace the index
             replaceIndex((Index) index_list.getSelectedValue(), index, metadatum);
             index_list.setSelectedValue(index, true);
-            
             }
             new_index_prompt.dispose();
-        
         }
         }