Changeset 25896

Timestamp:

2012-07-04T15:36:09+12:00 (12 years ago)

Author:

ak19

Message:

When doing incremental, don't want to be deleting building or moving it to index in activate.pl, but still need to do some activation for solr.

Location:

main/trunk/greenstone2/bin/script

Files:

• activate.pl (modified) (2 diffs)
• buildcol.pl (modified) (1 diff)

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

@@ -478 +478 @@
     
     &print_task_msg("Running  Collection  Activation  Stage");
-    
-    # can't do anything without a build directory with something in it to move into index
-    if(!&util::dir_exists($build_dir)) {
-        &print_msg("No building folder at $build_dir to move to index.\n");
-        exit -1;
-    } elsif (&util::is_dir_empty($build_dir)) {
-        &print_msg("Nothing in building folder $build_dir to move into index folder.\n");
-        exit -1;
-    }
-    
+    
     # get and check the collection name
     if ((&colcfg::use_collection($site, $qualified_collection, $collect_dir)) eq "") {
@@ -523 +514 @@
     } else {
     $buildtype = "mg"; #mg is the default
+    }    
+    
+    # can't do anything without a build directory with something in it to move into index
+    # Except if we're (doing incremental) building for solr, where we want to still
+    # activate and deactivate collections including for the incremental case
+    if(!&util::dir_exists($build_dir)) {
+    &print_msg("No building folder at $build_dir to move to index.\n");
+    exit -1 unless ($buildtype eq "solr"); #&& $incremental);
+    } elsif (&util::is_dir_empty($build_dir)) {
+    &print_msg("Nothing in building folder $build_dir to move into index folder.\n");
+    exit -1 unless ($buildtype eq "solr"); #&& $incremental);
     }
+    
 
     my $solr_server;

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

@@ -700 +700 @@
         push(@activate_argv,"-removeold") if($removeold);
         push(@activate_argv,"-keepold") if($keepold);
+        push(@activate_argv,"-incremental") if($incremental);
         my $quoted_argv = join(" ", map { "\"$_\"" } @activate_argv);