Changeset 19743 for gsdl/trunk/bin/script/incremental-buildcol.pl

Timestamp:

2009-06-05T10:51:46+12:00 (15 years ago)

Author:

davidb

Message:

incremental-buildcol.pl now looks for change of indexer between last and current build. Switches to full build if needed.

File:

• gsdl/trunk/bin/script/incremental-buildcol.pl (modified) (4 diffs)

gsdl/trunk/bin/script/incremental-buildcol.pl

@@ -39 +39 @@
 
 use strict;
+no strict 'refs'; # allow filehandles to be variables and vice versa
+no strict 'subs'; # allow barewords (eg STDERR) as function arguments
 
 use util;
-
+use colcfg;
 
 sub main
@@ -61 +63 @@
     my $collect = pop @argv;
 
-
     my @filtered_argv = ();
 
     my $collect_dir = undef;
     my $build_dir  = undef;
+    my $site = undef;
 
     while (my $arg = shift @argv) {
@@ -75 +77 @@
         $build_dir = shift @argv;
         push(@filtered_argv,$arg,$build_dir);
+    }
+    elsif ($arg eq "-site") {
+        $site = shift @argv;
+        push(@filtered_argv,$arg,$site);
     }
     else {
@@ -114 +120 @@
 
     if (-e $build_cfg_filename) {
-    $buildcol_cmd .= " -incremental";
+
+    # figure out if there has been a change of indexer 
+    # (e.g. collect.cfg now says lucene, but build.cfg says mgpp)
+
+    if ((&colcfg::use_collection($site, $collect, $collect_dir)) eq "") {
+        print STDERR "Unable to use collection \"$collect\" within \"$collect_dir\"\n";
+        exit -1;
+    }
+    # Read in the collection configuration file.
+    my ($collect_cfg_filename, $gs_mode) = &colcfg::get_collect_cfg_name(STDERR);
+    my $collectcfg = &colcfg::read_collection_cfg ($collect_cfg_filename,$gs_mode);
+
+    my $buildcfg = &colcfg::read_build_cfg ($build_cfg_filename);
+
+    if ($buildcfg->{'buildtype'} ne $collectcfg->{'buildtype'}) {
+        print STDERR "*****\n";
+        print STDERR "* Change of indexer detected. Switching to full buildcol.pl.\n";
+        print STDERR "*****\n";
+        $buildcol_cmd .= " -removeold";
+    }
+    else {
+
+        $buildcol_cmd .= " -incremental";
+    }
     }
     else {
-### print STDERR "$build_cfg_filename does not exist.\n";
+    # build.cfg doesn't exit
     print STDERR "*****\n";
     print STDERR "* First time built. Switching to full buildcol.pl.\n";