Changeset 19404 for gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java

Timestamp:

2009-05-12T13:45:58+12:00 (15 years ago)

Author:

oranfry

Message:

incremental import and build in gli (brought over from branch)

File:

• gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (15 diffs)

gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -51 +51 @@
 import org.greenstone.gatherer.cdm.CollectionMetaManager;
 import org.greenstone.gatherer.cdm.CommandTokenizer;
+import org.greenstone.gatherer.cdm.BuildTypeManager;
+import org.greenstone.gatherer.cdm.CollectionConfiguration;
 import org.greenstone.gatherer.greenstone.Classifiers;
 import org.greenstone.gatherer.greenstone.LocalGreenstone;
@@ -153 +155 @@
      * @see org.greenstone.gatherer.util.Utility
      */
-    public void buildCollection(boolean incremental_build)
-    {
-          
-    DebugStream.println("In CollectionManager.buildCollection(), incremental_build: " + incremental_build);
+    public void buildCollection()
+    {
+    
+    DebugStream.println("In CollectionManager.buildCollection(), CollectionDesignManager.isCompleteBuild(): " + CollectionDesignManager.isCompleteBuild());
     DebugStream.println("Is event dispatch thread: " + SwingUtilities.isEventDispatchThread());
     building = true;
@@ -187 +189 @@
     }
     else {
-        command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "buildcol.pl");
+        String buildType = (new CollectionMeta( CollectionDesignManager.collect_config.getBuildType() )).getValue(CollectionMeta.TEXT);
+        if ( !CollectionDesignManager.isCompleteBuild() && buildType.equals( BuildTypeManager.BUILD_TYPE_LUCENE ) ) {
+            command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "incremental-buildcol.pl");
+        } else {
+            command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "full-buildcol.pl");
+        }
     }
     command_parts_list.add("-gli");
@@ -194 +201 @@
     command_parts_list.add("-collectdir");
     command_parts_list.add(getCollectDirectory());
-
-    // If the user hasn't manually specified "-keepold" or "-removeold" then pick one based on incremental_build
-    if (!collection.build_options.getValueEnabled("keepold") && !collection.build_options.getValueEnabled("removeold")) {
-        command_parts_list.add(incremental_build ? "-keepold" : "-removeold");
-    }
 
     String[] build_options = collection.build_options.getValues();
@@ -217 +219 @@
 
     /*probably repeating alot of work, but I want to keep this separate... wendy*/
-    public void scheduleBuild(boolean incremental_build)
-    {
-
-    DebugStream.println("In CollectionManager.scheduleBuild(), incremental_build: " + incremental_build); 
+    public void scheduleBuild()
+    {
+    DebugStream.println("In CollectionManager.scheduleBuild(), CollectionDesignManager.isCompleteBuild(): " + CollectionDesignManager.isCompleteBuild()); 
     DebugStream.println("Is event dispatch threa: " + SwingUtilities.isEventDispatchThread()); 
 
@@ -240 +241 @@
         import_list.add("-S");
     }
-        import_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "import.pl");
+
+    String cmdPrefix = CollectionDesignManager.isCompleteBuild() ? "full-" : "incremental-";
+    import_list.add(LocalGreenstone.getBinScriptDirectoryPath() + cmdPrefix + "import.pl");
     import_list.add("-language");
     import_list.add(Configuration.getLanguage());
@@ -273 +276 @@
         build_list.add("-S");
     }
-    build_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "buildcol.pl");
+
+    String buildType = (new CollectionMeta( CollectionDesignManager.collect_config.getBuildType() )).getValue(CollectionMeta.TEXT);
+    if ( !CollectionDesignManager.isCompleteBuild() && buildType.equals( BuildTypeManager.BUILD_TYPE_LUCENE ) ) {
+        build_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "incremental-buildcol.pl");
+    } else {
+        build_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "full-buildcol.pl");
+    }
+
     build_list.add("-language");
     build_list.add(Configuration.getLanguage());
     build_list.add("-collectdir");
     build_list.add(getCollectDirectory());
-
-    // If the user hasn't manually specified "-keepold" or "-removeold" then pick one based on incremental_build
-    if (!collection.build_options.getValueEnabled("keepold") && !collection.build_options.getValueEnabled("removeold")) {
-        build_list.add(incremental_build ? "-keepold" : "-removeold");
-    }
 
     String[] build_options = collection.build_options.getValues();
@@ -345 +350 @@
     }
 
+    /** Used to determine whether the currently active collection has been imported.
+     * @return A boolean indicating the imported status of the collection.
+     */
+    public boolean imported() {
+        if ( collection != null ) {
+            String file_name = getLoadedCollectionDirectoryPath() + "archives";
+            File test_file = new File(file_name);
+            return test_file.exists();
+        }
+        return false;
+    }
 
     /** a test method to see if we can delete a directory/file - returns false is the file or any of the contents of a directory cannot be deleted */
@@ -549 +565 @@
         collection = new Collection(new File(collection_directory_path, name + ".col"));
 
-        // "-removeold" is on by default for import.pl
-        collection.import_options.setValue("removeold", true, null);
+        // "-removeold" is on by default for import.pl (not anymore; it would wreck incremental import)
+        //collection.import_options.setValue("removeold", true, null);
 
         // for remote case, scheduling causes an Exception on creating a new collection that 
@@ -1031 +1047 @@
     }
     else {
-        command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "import.pl");
+        String cmdPrefix = CollectionDesignManager.isCompleteBuild() ? "full-" : "incremental-";
+        command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + cmdPrefix + "import.pl");
     }
 
@@ -1042 +1059 @@
     String[] import_options = collection.import_options.getValues();
     for (int i = 0; i < import_options.length; i++) {
+        System.err.println( "Tacking on option: " + import_options[i] );
         command_parts_list.add(import_options[i]);
     }
@@ -1050 +1068 @@
     String[] command_parts = (String[]) command_parts_list.toArray(new String[0]);
     GShell shell = new GShell(command_parts, GShell.IMPORT, BUILDING, this, import_monitor, GShell.GSHELL_IMPORT);
+    //shell.setEventProperty("is_incremental", Boolean.toString(is_incremental));
     shell.addGShellListener(Gatherer.g_man.create_pane);
         shell.addGShellListener(Gatherer.g_man.format_pane);
@@ -1497 +1516 @@
     //ystem.err.println("CollectionManager.processComplete(" + event.getType() + ")");
     Gatherer.g_man.lockCollection((event.getType() == GShell.IMPORT), false);
-    ///ystem.err.println("Recieved process complete event - " + event);
+    ///ystem.err.println("Received process complete event - " + event);
     // If we were running an import, now run a build.
     if(event.getType() == GShell.IMPORT && event.getStatus() == GShell.OK) {
@@ -1504 +1523 @@
         collection.setFilesChanged(false);
         collection.setMetadataChanged(false);
-        buildCollection(false);
+        buildCollection();
     }
     else if(event.getType() == GShell.SCHEDULE && event.getStatus() == GShell.OK ) {
@@ -1517 +1536 @@
     else if(event.getType() == GShell.BUILD && event.getStatus() == GShell.OK) {
             
-        if(installCollection()) {
-        // If we have a local library running then ask it to add our newly create collection
-        if (LocalLibraryServer.isRunning() == true) {
-            LocalLibraryServer.addCollection(collection.getName());
-        }
-        else if (Gatherer.GS3) {
-            //xiao comment out this: convertToGS3Collection();
-            Gatherer.configGS3Server(Configuration.site_name, ServletConfiguration.ADD_COMMAND + collection.getName());
-        }  
-
-        // Fire a collection changed first to update the preview etc buttons
-        Gatherer.refresh(Gatherer.COLLECTION_REBUILT);
-
-        // Now display a message dialog saying its all built
-        WarningDialog collection_built_warning_dialog = new WarningDialog("warning.CollectionBuilt", Dictionary.get("CollectionBuilt.Title"), Dictionary.get("CollectionBuilt.Message"), null, false);
-        collection_built_warning_dialog.setMessageOnly(true); // Not a warning
-        collection_built_warning_dialog.display();
-        collection_built_warning_dialog.dispose();
-        collection_built_warning_dialog = null;
-
-        //Set nothing as needing rebuilding, as a build has just finished :-)
-        CollectionDesignManager.resetRebuildTypeRequired();
-        }
-        else {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Preview_Ready_Failed"), Dictionary.get("CollectionManager.Preview_Ready_Title"), JOptionPane.ERROR_MESSAGE);
-        Gatherer.refresh(Gatherer.COLLECTION_REBUILT);
-        DebugStream.println("Status is ok but !installCollection()");
-        }
+        if ( CollectionDesignManager.isCompleteBuild() ) {
+            if(installCollection()) {
+            // If we have a local library running then ask it to add our newly create collection
+            if (LocalLibraryServer.isRunning() == true) {
+                LocalLibraryServer.addCollection(collection.getName());
+            }
+            else if (Gatherer.GS3) {
+                //xiao comment out this: convertToGS3Collection();
+                Gatherer.configGS3Server(Configuration.site_name, ServletConfiguration.ADD_COMMAND + collection.getName());
+            }  
+
+            // Fire a collection changed first to update the preview etc buttons
+            Gatherer.refresh(Gatherer.COLLECTION_REBUILT);
+
+            // Now display a message dialog saying its all built
+            WarningDialog collection_built_warning_dialog = new WarningDialog("warning.CollectionBuilt", Dictionary.get("CollectionBuilt.Title"), Dictionary.get("CollectionBuilt.Message"), null, false);
+            collection_built_warning_dialog.setMessageOnly(true); // Not a warning
+            collection_built_warning_dialog.display();
+            collection_built_warning_dialog.dispose();
+            collection_built_warning_dialog = null;
+
+            //Set nothing as needing rebuilding, as a build has just finished :-)
+            CollectionDesignManager.resetRebuildTypeRequired();
+            }
+            else {
+            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Preview_Ready_Failed"), Dictionary.get("CollectionManager.Preview_Ready_Title"), JOptionPane.ERROR_MESSAGE);
+            Gatherer.refresh(Gatherer.COLLECTION_REBUILT);
+            DebugStream.println("Status is ok but !installCollection()");
+            }
+        }
     }
     else if (event.getStatus() == GShell.CANCELLED) {