Changeset 260 for trunk/soft/ObsData/bin

Timestamp:

10/19/06 17:14:37 (18 years ago)

Author:

nanardon

Message:

• add --not-done option to replay files which was not done yet

File:

• trunk/soft/ObsData/bin/obsdata (modified) (5 diffs)

trunk/soft/ObsData/bin/obsdata

@@ -34 +34 @@
     'plugindir=s' => \my $plugindir,
     'noreport' => \my $noreport,
+    'not-done' => \my $not_done,
 ) or pod2usage();
 
@@ -49 +50 @@
 Use this configuration file
 
-=item --check
-
-Only check config file and exit
-
 =item -l|--logfile logfile
 
 Write all messages into this file
 
-=item -v|--verbose
+=item --not-done
 
-Increase verbosity (this does not affect log output)
+Replay archives already find but not extracted
+
+=item --check
+
+Only check config file and exit
 
 =item --dry-run
@@ -68 +69 @@
 
 Do not send mail report
+
+=item -v|--verbose
+
+Increase verbosity (this does not affect log output)
 
 =item --debug
@@ -85 +90 @@
 =cut
 
-sub sub_interactive {
-    my ($oa, $oe) = @_;
-    for ($oe->id) {
-        /^do_archive$/ and do {
-            if ($onlyold && !$oe->test_result('archive_exists')) {
-                return 0;
-            }
-            if($onlynew && $oe->test_result('archive_exists')) {
-                return 0
-            }
-        };
-        /^overwrite$/ && !$oe->test_result('dest_exists') and return 1;
+my $interactive_callback = undef;
+
+if ($not_done) {
+    $interactive_callback = sub  {
+        my ($oa, $oe) = @_;
+        for ($oe->id) {
+            /^do_archive$/ and return $oe->test_result('archive_exists') || 0;
+            /^overwrite$/ and return($oe->test_result('dest_exists') ? 0 : 1);
+            /^do_data$/ && $not_done and return !$oe->test_result('data_extracted') || 0;
+        }
+        0
     }
-    print $oe->message ."\n";
-    foreach ($oe->list_test) {
-        printf("\t%s\n", $oe->test_message($_));
+}
+
+if ($interactif) {
+    $interactive_callback = sub {
+        my ($oa, $oe) = @_;
+        for ($oe->id) {
+            /^do_archive$/ and do {
+                if ($onlyold && !$oe->test_result('archive_exists')) {
+                    return 0;
+                }
+                if($onlynew && $oe->test_result('archive_exists')) {
+                    return 0
+                }
+            };
+            /^overwrite$/ && !$oe->test_result('dest_exists') and return 1;
+        }
+        print $oe->message ."\n";
+        foreach ($oe->list_test) {
+            printf("\t%s\n", $oe->test_message($_));
+        }
+        print "Processing ? Y/n: ";
+        my $res = <STDIN>;
+        chomp($res);
+        return($res =~ /^[Yy]$/ ? 1 : 0);
     }
-    print "Processing ? Y/n: ";
-    my $res = <STDIN>;
-    chomp($res);
-    return($res =~ /^[Yy]$/ ? 1 : 0);
 }
 
@@ -118 +139 @@
         printf("%-9s %s\n", sprintf("[%s]", ObsData::loglevel($_[0])), $_[1]);
     },
-    interactive_callback => $interactif ? \&sub_interactive : undef,
+    interactive_callback => $interactive_callback,
 ) or do {
     warn "Can't create obsdata object\n";