Changeset 10528

Timestamp:

2005-08-19T11:34:33+12:00 (19 years ago)

Author:

kjdon

Message:

changed isMGPPEnabled to isSearchTypeEnabled, added isMGPP() and isLucene() - need to differentiate between the two so that when you preview a lucene collection you get the args right

File:

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

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

@@ -54 +54 @@
     static final private Dimension LABEL_SIZE = new Dimension(150, 25);
 
+    static final public String BUILD_TYPE_LUCENE = "lucene";
+    static final public String BUILD_TYPE_MGPP = "mgpp";
+    
     static final public String[] SEARCH_TYPES = {  "plain" , "form"};
-    static final public String[] BUILD_TYPES = {  "lucene", "mgpp" };
+    static final public String[] BUILD_TYPES = {  BUILD_TYPE_LUCENE, BUILD_TYPE_MGPP };
     
     /** the buildtype element in the config file  - searchtypemanager looks 
@@ -105 +108 @@
      * @return true if MGPP is enabled, false otherwise
      */
-    public boolean isMGPPEnabled() {
+    public boolean isSearchTypeEnabled() {
     return root.getAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE).equals(CollectionConfiguration.TRUE_STR);
+    }
+    
+    public boolean isMGPP() {
+    return isSearchTypeEnabled() && build_type.getValue(CollectionMeta.TEXT).equals(BUILD_TYPE_MGPP);
+    }
+
+    public boolean isLucene() {
+    return isSearchTypeEnabled() && build_type.getValue(CollectionMeta.TEXT).equals(BUILD_TYPE_LUCENE);
     }
     
@@ -212 +223 @@
         } else {
         build_type.setValue((String)build_type_combobox.getSelectedItem());
-        build_type.setAssigned(isMGPPEnabled());
+        build_type.setAssigned(isSearchTypeEnabled());
 
         }
@@ -340 +351 @@
     public void gainFocus() {
         instructions_textarea.setCaretPosition(0);
-        validateControls(isMGPPEnabled());
+        validateControls(isSearchTypeEnabled());
     }