Changeset 19430 for gli

Timestamp:

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

Author:

oranfry

Message:

correcting for whether to copy building to index

Location:

gli/trunk/src/org/greenstone/gatherer

Files:

• cdm/CollectionDesignManager.java (modified) (2 diffs)
• collection/CollectionManager.java (modified) (3 diffs)

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

@@ -89 +89 @@
 
     /** This indicates whether a minimal or complete build is required.
-        Minimal means do everything with the -incremental flag. Complete means do everything with -removeold */
+        Minimal means do everything with the -incremental flag. Complete means do everything with -removeold
+        Note: This stores preceisely whether the user selected the minimal or full build radio button.
+        Its value does not indicate anything about what gli eventually chose as a result of that "suggestion" */
     static private boolean isCompleteBuild = false;
 
+    /** These remember which scripts were run for the last build.
+        true indicated 'full-' prefix, false indicates 'incremental-' prefix to the given perl script (import.pl or buildcol.pl)
+        Note: This stores what gli did, regardless of whether minimal or full was requested by the user */
+    static private boolean importWasFull = false;
+    static private boolean buildcolWasFull = false;
 
     /** Constructor. Loads a certain collection configuration file, which is parsed into a DOM. This model is then registered with the command information managers, each of whom knows how to, and provides controls to, alter certain commands.
@@ -225 +232 @@
     }
 
+    public static void setImportWasFull( boolean wasFull ) {
+        importWasFull = wasFull;
+    }
+    public static boolean importWasFull() {
+        return importWasFull;
+    }
+    public static void setBuildcolWasFull( boolean wasFull ) {
+        buildcolWasFull = wasFull;
+    }
+    public static boolean buildcolWasFull() {
+        return buildcolWasFull;
+    }
+
     /**
      * What exactly does this do?

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