Changeset 9907

Timestamp:

2005-05-18T17:08:50+12:00 (19 years ago)

Author:

kjdon

Message:

added a build type selection element - mgpp/lucene

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/SearchTypeManager.java (modified) (16 diffs)

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

@@ -45 +45 @@
 import org.w3c.dom.*;
 
-/** This class maintains an ordered list of the search types available in the collection (MGPP command available in G2.39 or later). Currently only 'form' and 'plain' are valid.
+/** This class maintains an ordered list of the search types available in the collection (MGPP/lucene command available in G2.39 or later). Currently only 'form' and 'plain' are valid.
  * @author John Thompson, Greenstone Digital Library, University of Waikato
  * @version 2.4
@@ -51 +51 @@
 public class SearchTypeManager
     extends DOMProxyListModel {
-
-    static final public String[] SEARCH_TYPES = { "form", "plain" };
-
+    
+    static final public String[] SEARCH_TYPES = {  "plain" , "form"};
+    static final public String[] BUILD_TYPES = {  "lucene", "mgpp" };
+    
+    /** the buildtype element in the config file  - searchtypemanager looks 
+     * after this now */
+    public CollectionMeta build_type = null;
     /** The controls used to edit the search types. */
     private Control controls = null;
@@ -63 +67 @@
     this.model = this;
     DebugStream.println("SearchTypeManager: parsed " + getSize() + " search types.");
+    build_type = new CollectionMeta(CollectionDesignManager.collect_config.getBuildType());
+
     }
 
@@ -71 +77 @@
     }
     }
-
+    
     public Control getControls() {
     if(controls == null) {
@@ -79 +85 @@
     }
 
-    /** Return a list of the currently assigned search types as a comma separated string.
-     * @return a String
-     */
-    public String getSearchTypes() {
-        StringBuffer search_types = new StringBuffer();
-        ArrayList types = children();
-        for (int i = 0; i < types.size(); i++) {
-            if (i>0) {
-                search_types.append(",");
-            }
-            search_types.append(((SearchType)types.get(i)).getName());
-        }
-        return search_types.toString();
-    }
-
-    /** Be examining the SearchType 'root' we were created with, determine if mgpp is enabled.
-     * @return true if MGPP is enabled, false otherwise
-     */
-    public boolean isMGPPEnabled() {
-        return root.getAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE).equals(CollectionConfiguration.TRUE_STR);
-    }
-
+    /** Return a list of the currently assigned search types as a comma separated string.
+     * @return a String
+     */
+    public String getSearchTypes() {
+    StringBuffer search_types = new StringBuffer();
+    ArrayList types = children();
+    for (int i = 0; i < types.size(); i++) {
+        if (i>0) {
+        search_types.append(",");
+        }
+        search_types.append(((SearchType)types.get(i)).getName());
+    }
+    return search_types.toString();
+    }
+    
+    /** By examining the SearchType 'root' we were created with, determine if mgpp is enabled.
+     * @return true if MGPP is enabled, false otherwise
+     */
+    public boolean isMGPPEnabled() {
+    return root.getAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE).equals(CollectionConfiguration.TRUE_STR);
+    }
+    
     private void moveSearchType(SearchType search_type, boolean direction) {
     // Try to move the classifier one step in the desired direction.
@@ -142 +148 @@
 
     private GComboBox search_type_combobox;
+    private GComboBox build_type_combobox;
 
     private JButton add_button;
@@ -159 +166 @@
 
     public SearchTypeControl() {
+    
         // Creation
         title_label = new JLabel();
@@ -179 +187 @@
         JPanel inner_panel = new JPanel();
 
+        JPanel indexer_type_panel = new JPanel();
+        JPanel build_type_panel = new JPanel();
+
         enable_advanced_searches_checkbox = new JCheckBox();
         Dictionary.registerText(enable_advanced_searches_checkbox, "CDM.SearchTypeManager.Enable");
 
+        build_type_combobox = new GComboBox(BUILD_TYPES);
+        build_type_combobox.setPreferredSize(Utility.LABEL_SIZE);
+        build_type_combobox.setBackgroundNonSelectionColor(Configuration.getColor("coloring.editable_background", false));
+        build_type_combobox.setBackgroundSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
+        build_type_combobox.setEditable(true);
+        build_type_combobox.setSelectedIndex(1);// mgpp is at 1
+        String selected_value = build_type.getValue(CollectionMeta.TEXT);
+        if (!selected_value.equals("")) {
+        for (int i=0; i<build_type_combobox.getItemCount();i++) {
+            String item = (String)build_type_combobox.getItemAt(i);
+            if (item.equals(selected_value)) {
+            build_type_combobox.setSelectedIndex(i);
+            break;
+            }
+        }
+        } else {
+        build_type.setValue((String)build_type_combobox.getSelectedItem());
+        build_type.setAssigned(isMGPPEnabled());
+
+        }
+        build_type_combobox.setTextNonSelectionColor(Configuration.getColor("coloring.workspace_tree_foreground", false));
+        build_type_combobox.setTextSelectionColor(Configuration.getColor("coloring.collection_selection_foreground", false));
+        Dictionary.registerTooltip(build_type_combobox, "CDM.SearchTypeManager.BuildType_Selection_Tooltip");
+
+        JLabel build_type_label = new JLabel();
+        Dictionary.registerText(build_type_label, "CDM.SearchTypeManager.BuildType_Selection");
         JPanel current_search_types_panel = new JPanel();
         current_search_types_label = new JLabel();
@@ -193 +230 @@
         move_up_button.setEnabled(false);
         move_up_button.setMnemonic(KeyEvent.VK_U);
-        //move_up_button.setPreferredSize(Utility.DOUBLE_IMAGE_BUTTON_SIZE);
+
         Dictionary.registerBoth(move_up_button, "CDM.Move.Move_Up", "CDM.Move.Move_Up_Tooltip");
 
@@ -199 +236 @@
         move_down_button.setEnabled(false);
         move_down_button.setMnemonic(KeyEvent.VK_D);
-        //move_down_button.setPreferredSize(Utility.DOUBLE_IMAGE_BUTTON_SIZE);
+
         Dictionary.registerBoth(move_down_button, "CDM.Move.Move_Down", "CDM.Move.Move_Down_Tooltip");
 
@@ -210 +247 @@
         search_type_combobox.setBackgroundSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
         search_type_combobox.setEditable(true);
-        search_type_combobox.setSelectedIndex(0);
+        search_type_combobox.setSelectedIndex(0); 
         search_type_combobox.setTextNonSelectionColor(Configuration.getColor("coloring.workspace_tree_foreground", false));
         search_type_combobox.setTextSelectionColor(Configuration.getColor("coloring.collection_selection_foreground", false));
@@ -225 +262 @@
         remove_button.setMnemonic(KeyEvent.VK_R);
         Dictionary.registerBoth(remove_button, "CDM.SearchTypeManager.Remove", "CDM.SearchTypeManager.Remove_Tooltip");
-
+        
+      
         // Connection
         add_button.addActionListener(new AddActionListener());
+        build_type_combobox.addActionListener(new BuildTypeActionListener());
         current_search_types_list.addListSelectionListener(new CurrentSearchTypesListSelectionListener());
         enable_advanced_searches_checkbox.addActionListener(new EnableAdvancedSearchesActionListener());
@@ -254 +293 @@
         current_search_types_panel.add(movement_panel, BorderLayout.EAST);
 
+        build_type_panel.setLayout(new BorderLayout());
+        build_type_panel.add(build_type_label, BorderLayout.WEST);
+        build_type_panel.add(build_type_combobox, BorderLayout.CENTER);
+
+        indexer_type_panel.setLayout(new GridLayout(1,2,0,5));
+        indexer_type_panel.add(enable_advanced_searches_checkbox);
+        indexer_type_panel.add(build_type_panel);
+        
         button_panel.setBorder(BorderFactory.createEmptyBorder(2,0,0,0));
         button_panel.setLayout(new GridLayout(1,2,0,5));
@@ -265 +312 @@
 
         inner_panel.setLayout(new BorderLayout());
-        inner_panel.add(enable_advanced_searches_checkbox, BorderLayout.NORTH);
+        inner_panel.add(indexer_type_panel, BorderLayout.NORTH);
         inner_panel.add(current_search_types_panel, BorderLayout.CENTER);
         inner_panel.add(search_type_panel, BorderLayout.SOUTH);
@@ -298 +345 @@
         // validate other controls.
         current_search_types_list.setEnabled(advanced_search_enabled);
+        build_type_combobox.setEnabled(advanced_search_enabled);
         enable_advanced_searches_checkbox.setSelected(advanced_search_enabled);
         search_type_combobox.setEnabled(advanced_search_enabled);
@@ -362 +410 @@
         CollectionDesignManager.index_manager.setMGPPEnabled(advanced_search_enabled);
         validateControls(advanced_search_enabled);
+        build_type.setAssigned(advanced_search_enabled);
         Gatherer.g_man.wait(false);
         }
     }
 
+    private class BuildTypeActionListener
+        implements  ActionListener {
+
+        public void actionPerformed(ActionEvent event) {
+        build_type.setValue((String)build_type_combobox.getSelectedItem());
+        }
+
+    }
     /** Listenes for actions on the Remove button, and if detected removes the currently selected search types. */
     private class RemoveActionListener