Changeset 6006

Timestamp:

2003-11-25T16:32:41+13:00 (20 years ago)

Author:

jmt12

Message:

The number of build indexes now takes into account the number of partitions and the number of index languages. It's still waiting on the Phind stuff as I need to talk to Michael about what sentinel values will survive the horror of translation

File:

• trunk/gli/src/org/greenstone/gatherer/shell/GBuildProgressMonitor.java (modified) (5 diffs)

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

@@ -40 +40 @@
 import javax.swing.JProgressBar;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.cdm.CollectionDesignManager;
 import org.greenstone.gatherer.shell.GImportProgressMonitor;
 import org.greenstone.gatherer.shell.GShellProgressMonitor;
@@ -83 +84 @@
     static final int CTID_PS     = 16; // Creating the info database - parsed successfully
     static final int CAF         = 17; // Creating auxiliary files
+    static final int PHIND       = 18; // Running Phind
+    static final int SUFFIX      = 19; // Running Suffix
+    static final int SUFFIX_DONE = 20; // Suffix Complete
 
     static final String BI_STR   = "*** building index";
@@ -97 +101 @@
     static final String ITT_STR  = "inverting the text";
     static final String PS_STR   = "hash";
+    static final String PHIND_STR = "*** Phind.pm";
+    static final String PHIND_SUFFIX_STR = "suffix:";
+    static final String PHIND_DONE_STR = "Done:";
 
     public GBuildProgressMonitor(GImportProgressMonitor import_progress) {
@@ -169 +176 @@
             ///ystem.err.println("CTID [" + state + "] - " + ((progress_bar.getValue() * 100) / MAX) + "%");
         }
+        else if(line.startsWith(PHIND_STR)) {
+            
+        }
         else if(line.indexOf(CAF_STR) != -1) {
             // Skip the progres up to this point
@@ -320 +330 @@
      */
     public void start() {
+    CollectionDesignManager cdm = Gatherer.c_man.getCollection().cdm;
     progress_bar.setValue(MIN);
-    num_indexes = Gatherer.c_man.getCollection().cdm.index_manager.getSize();
+    num_indexes = cdm.index_manager.getSize();
+    int num_partitions = cdm.subcollectionindex_manager.getSize();
+    if(num_partitions > 0) {
+        num_indexes = num_indexes * num_partitions;
+    }
+    int num_languages = cdm.language_manager.getSize();
+    if(num_languages > 0) {
+        num_indexes = num_indexes * num_languages;
+    }
     num_docs = import_progress.getNumberOfDocuments();
+    cdm = null;
     }
     /** This method indicates the process is complete.