Changeset 23218

Timestamp:

2010-10-27T10:47:36+13:00 (13 years ago)

Author:

kjdon

Message:

fixed up -manifest use with this script. -manifest needs -keepold instead of -incremental

File:

• main/trunk/greenstone2/bin/script/incremental-import.pl (modified) (3 diffs)

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

@@ -68 +68 @@
     my $archive_dir  = undef;
     my $site = undef;
+    my $manifest = undef;
 
     while (my $arg = shift @argv) {
@@ -85 +86 @@
         $site = shift @argv;
         push(@filtered_argv,$arg,$site);
+    }
+    elsif ($arg eq "-manifest") {
+        $manifest = shift @argv;
+        push(@filtered_argv,$arg,$manifest);
     }
     else {
@@ -136 +141 @@
     }
 
-    if (-e $archiveinf_doc_file_path) {
-    $import_cmd .= " -incremental";
-    
+    if (defined $manifest) {
+    # manifest files need -keepold not -incremental
+    $import_cmd .= " -keepold";
+    } else {
+    if (-e $archiveinf_doc_file_path) {
+        $import_cmd .= " -incremental";
+        
+    }
+    else {
+        print STDERR "*****\n";
+        print STDERR "First time import. Switching to full import.pl.\n";
+        print STDERR "*****\n";
+        $import_cmd .= " -removeold";
+    }
     }
-    else {
-    print STDERR "*****\n";
-    print STDERR "First time import. Switching to full import.pl.\n";
-    print STDERR "*****\n";
-    $import_cmd .= " -removeold";
-    }
-
     $import_cmd .= " $quoted_argv \"$collection\"";