Changeset 21733

Timestamp:

2010-02-24T13:56:56+13:00 (14 years ago)

Author:

kjdon

Message:

a little tidying up and code reuse and making these work for gs3 with -site arg

Location:

main/trunk/greenstone2/bin/script

Files:

• incremental-buildcol.pl (modified) (4 diffs)
• incremental-import.pl (modified) (5 diffs)

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

@@ -61 +61 @@
 
 
-    my $collect = pop @argv;
+    my $collection = pop @argv;
 
     my @filtered_argv = ();
@@ -87 +87 @@
     }
 
-
-    if (!defined $collect_dir) {
-    $collect_dir = &util::filename_cat($ENV{'GSDLHOME'},"collect");
-    }
-    my $this_collect_dir = &util::filename_cat($collect_dir,$collect);
-
-    if (!-d $this_collect_dir) {
-    print STDERR "Error: $collect_dir does not exist\n";
-    exit(-1);
-    }
+    # get and check the collection name
+    if ((&colcfg::use_collection($site, $collection, $collect_dir)) eq "") {
+    print STDERR "Unable to use collection \"$collection\" within \"$collect_dir\"\n";
+    exit -1;
+    }   
 
 
     if (!defined $build_dir) {
     # Yes this is intentional that 'build_dir' points to "index"
-    $build_dir = &util::filename_cat($this_collect_dir,"index");
+    $build_dir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'},"index");
     push(@filtered_argv,"-builddir",$build_dir);
     }
@@ -119 +114 @@
     }
 
-    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);
@@ -163 +154 @@
 
     
-    $buildcol_cmd .= " $quoted_argv \"$collect\"";
+    $buildcol_cmd .= " $quoted_argv \"$collection\"";
     
     my $buildcol_status = system($buildcol_cmd)/256;

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

@@ -43 +43 @@
 use dbutil;
 use util;
-
+use colcfg;
 
 sub main
@@ -61 +61 @@
 
 
-    my $collect = pop @argv;
+    my $collection = pop @argv;
 
     my @filtered_argv = ();
@@ -67 +67 @@
     my $collect_dir = undef;
     my $archive_dir  = undef;
+    my $site = undef;
 
     while (my $arg = shift @argv) {
@@ -81 +82 @@
         push(@filtered_argv,$arg,$archive_dir);
     }
+    elsif ($arg eq "-site") {
+        $site = shift @argv;
+        push(@filtered_argv,$arg,$site);
+    }
     else {
         push(@filtered_argv,$arg);
     }
     }
-
-    if (!defined $collect_dir) {
-    $collect_dir = &util::filename_cat($ENV{'GSDLHOME'},"collect");
-    }
-    my $this_collect_dir = &util::filename_cat($collect_dir,$collect);
-
-    if (!-d $this_collect_dir) {
-    print STDERR "Error: $this_collect_dir does not exist\n";
-    exit(-1);
-    }
-
+    
+    # get and check the collection name
+    if ((&colcfg::use_collection($site, $collection, $collect_dir)) eq "") {
+    print STDERR "Unable to use collection \"$collection\" within \"$collect_dir\"\n";
+    exit -1;
+    }   
 
     if (!defined $archive_dir) {
-    $archive_dir = &util::filename_cat($this_collect_dir,"archives");
+    $archive_dir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "archives")
     }
 
@@ -132 +132 @@
     }
 
-    $import_cmd .= " $quoted_argv \"$collect\"";
+    $import_cmd .= " $quoted_argv \"$collection\"";