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

Timestamp:

2009-05-13T14:14:42+12:00 (15 years ago)

Author:

oranfry

Message:

correcting for whether to copy building to index

File:

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

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

@@ -189 +189 @@
     }
     else {
-        String buildType = (new CollectionMeta( CollectionDesignManager.collect_config.getBuildType() )).getValue(CollectionMeta.TEXT);
-        if ( !CollectionDesignManager.isCompleteBuild() && buildType.equals( BuildTypeManager.BUILD_TYPE_LUCENE ) ) {
+        
+        if ( !CollectionDesignManager.isCompleteBuild() && CollectionDesignManager.index_manager.isLucene() ) {
             command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "incremental-buildcol.pl");
+            CollectionDesignManager.setBuildcolWasFull(false);
         } else {
             command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "full-buildcol.pl");
-        }
-    }
+            CollectionDesignManager.setBuildcolWasFull(true);
+        }
+    }
+
     command_parts_list.add("-gli");
     command_parts_list.add("-language");
@@ -1047 +1050 @@
     }
     else {
-        String cmdPrefix = CollectionDesignManager.isCompleteBuild() ? "full-" : "incremental-";
+        String cmdPrefix = null;
+        if ( CollectionDesignManager.isCompleteBuild() ) {
+            cmdPrefix = "full-";
+            CollectionDesignManager.setImportWasFull( true );
+        } else {
+            cmdPrefix = "incremental-";
+            CollectionDesignManager.setImportWasFull( false );
+        }
         command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + cmdPrefix + "import.pl");
     }
@@ -1536 +1546 @@
     else if(event.getType() == GShell.BUILD && event.getStatus() == GShell.OK) {
             
-        if ( CollectionDesignManager.isCompleteBuild() ) {
+        if ( CollectionDesignManager.buildcolWasFull() ) {
             if(installCollection()) {
             // If we have a local library running then ask it to add our newly create collection