Changeset 26441

Timestamp:

2012-11-06T01:44:26+13:00 (11 years ago)

Author:

davidb

Message:

Additional minus-option syntax added to allow the user to specify a command that is sent to import.pl (e.g. -import:OIDType ...) or buildcol.pl (e.g. -buildcol:mode onlyinfodb).

Location:

main/trunk/greenstone2/bin/script

Files:

• full-rebuild.pl (modified) (2 diffs)
• incremental-rebuild.pl (modified) (1 diff)

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

@@ -132 +132 @@
         push(@import_argv,$arg,$site);
         push(@buildcol_argv,$arg,$site);
-        push(@activate_argv,$arg,$site);
+        push(@activate_argv,$arg,$site);
     }
     elsif ($arg eq "-collectdir") {
@@ -163 +163 @@
         push(@activate_argv,$arg,$verbosity);
     }
+    elsif ($arg =~ /-import:(.*)$/) {       
+        my $import_arg = "-".$1;
+        my $import_val = shift @argv;
+        push(@import_argv,$import_arg,$import_val);
+    }
+    elsif ($arg =~ /-buildcol:(.*)$/) {     
+        my $buildcol_arg = "-".$1;
+        my $buildcol_val = shift @argv;
+        push(@buildcol_argv,$buildcol_arg,$buildcol_val);
+    }
+    elsif ($arg =~ /-activate:(.*)$/) {     
+        my $activate_arg = "-".$1;
+        my $activate_val = shift @argv;
+        push(@activate_argv,$activate_arg,$activate_val);
+    }
     else {
         push(@import_argv,$arg);

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

@@ -89 +89 @@
         push(@buildcol_argv,$arg,$index_dir);
     }
+    elsif ($arg =~ /-import:(.*)$/) {       
+        my $import_arg = "-".$1;
+        my $import_val = shift @argv;
+        push(@import_argv,$import_arg,$import_val);
+    }
+    elsif ($arg =~ /-buildcol:(.*)$/) {     
+        my $buildcol_arg = "-".$1;
+        my $buildcol_val = shift @argv;
+        push(@buildcol_argv,$buildcol_arg,$buildcol_val);
+    }
     else {
         push(@import_argv,$arg);