Changeset 10530

Timestamp:

2005-08-19T11:36:46+12:00 (19 years ago)

Author:

kjdon

Message:

modified to use new searchtypemanager isSearchTypeEnabled instead of isMGPPEnabled

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/CollectionDesignManager.java (modified) (1 diff)
• cdm/IndexManager.java (modified) (2 diffs)
• shell/GBuildProgressMonitor.java (modified) (1 diff)

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

@@ -133 +133 @@
 
     searchtype_manager = new SearchTypeManager(collect_config.getSearchType());
-    if(searchtype_manager.isMGPPEnabled()) {
+    if(searchtype_manager.isSearchTypeEnabled()) {
+        // note this this could be lucene now, the format is the same as for mgpp
         index_manager = new IndexManager(collect_config.getMGPPIndexes());
     }

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

@@ -200 +200 @@
     }
 
-
+    public int getNumLevels() {
+    return levels_model.getSize();
+    }
     private void moveIndex(Index index, boolean move_up)
     {
@@ -708 +710 @@
 
     public void gainFocus() {
-        boolean mgpp_enabled = CollectionDesignManager.searchtype_manager.isMGPPEnabled();
+        boolean mgpp_enabled = CollectionDesignManager.searchtype_manager.isSearchTypeEnabled();
         if(instruction_textarea != null) {
         instruction_textarea.setCaretPosition(0);

trunk/gli/src/org/greenstone/gatherer/shell/GBuildProgressMonitor.java

@@ -506 +506 @@
     CollectionDesignManager cdm = Gatherer.c_man.getCollection().cdm;
     // If we are using MGPP the number of indexes is always 1
-    if(cdm.searchtype_manager.isMGPPEnabled()) {
+    if(cdm.searchtype_manager.isMGPP()) {
         expected_stages = expected_stages + 1;
+    } else if (cdm.searchtype_manager.isLucene()) {
+        // lucene no of indexes == number of levels
+        int num_levels = cdm.index_manager.getNumLevels();
+        if (num_levels == 0) num_levels = 1;
+        expected_stages = expected_stages + num_levels;
     }
     else {