Changeset 30499

Timestamp:

2016-05-05T18:18:40+12:00 (8 years ago)

Author:

ak19

Message:

First commit to do with incremental-rebuild. Getting incremental-rebuild.pl to work with activate.pl.

Location:

main/trunk/greenstone2/bin/script

Files:

• activate.pl (modified) (3 diffs)
• incremental-rebuild.pl (modified) (1 diff)

main/trunk/greenstone2/bin/script/activate.pl

@@ -594 +594 @@
     } else {
     $buildtype = "mg"; #mg is the default
-    }    
+    }
     
     # can't do anything without a build directory with something in it to move into index
@@ -747 +747 @@
         }
         
-        # Copy just the contents of building dir into the index dir, overwriting 
-        # existing files, but don't replace index with building.
-        &print_task_msg("Moving \"building\" -> \"index\"");
-        &FileUtils::moveDirectoryContents($build_dir, $index_dir);
+        if($build_dir eq $index_dir) { # building_dir can have been set to "index" folder, see incremental-buildcol.pl
+            &print_task_msg("building folder is index folder, not moving");
+        } else {
+            # Copy just the contents of building dir into the index dir, overwriting 
+            # existing files, but don't replace index with building.
+            &print_task_msg("Moving \"building\" -> \"index\"");        
+            &FileUtils::moveDirectoryContents($build_dir, $index_dir);
+        }
     }
 
@@ -778 +782 @@
     # 4. Ping the library URL, and if it's a persistent server and running, activate the collection again   
     
-    # Check for success: if building does not exist OR is empty 
-    if(!&FileUtils::directoryExists($build_dir) || &FileUtils::isDirectoryEmpty($build_dir)) {
+    # Check for success: if building does not exist OR is empty OR if building is index (in which case there was no move)   
+    if($build_dir eq $index_dir || !&FileUtils::directoryExists($build_dir) || &FileUtils::isDirectoryEmpty($build_dir)) {
     
         if(!$skipactivation && $library_url) { # undef if no valid server URL

main/trunk/greenstone2/bin/script/incremental-rebuild.pl

@@ -134 +134 @@
     print STDERR "* Running Buildcol Stage\n";
     print STDERR "************************\n";
-    
 
-    my $buildcol_cmd = $launch_cmd . "incremental-buildcol.pl $quoted_buildcol_argv \"$collect\"";
+    # run incremental buildcol with activate flag
+    my $buildcol_cmd = $launch_cmd . "incremental-buildcol.pl -activate $quoted_buildcol_argv \"$collect\"";
     my $buildcol_status = system($buildcol_cmd)/256;
     if ($buildcol_status != 0) {