Changeset 29652

Timestamp:

Nov 3, 2010, 12:16:05 PM (16 years ago)

Author:

rhenders

Message:

More filter arguments

File:

• trunk/ippToPsps/perl/checkOdmStatus.pl (modified) (4 diffs)

trunk/ippToPsps/perl/checkOdmStatus.pl

@@ -22 +22 @@
 my $onlyCheckUndeleted = undef;
 my $onlyCheckMergeWorthy = undef;
+my $onlyCheckMerged = undef;
 
 
@@ -31 +32 @@
         'location|l=s' => \$filePath,
         'onlyundeleted|u' => \$onlyCheckUndeleted,
-        'onlymergeworthy|m' => \$onlyCheckMergeWorthy,
+        'onlymergeworthy|w' => \$onlyCheckMergeWorthy,
+        'onlymerged|m' => \$onlyCheckMerged,
         'remove|r' => \$removeUnprocessed,
         'verbose|v' => \$verbose,
@@ -54 +56 @@
     print "* OPTIONAL: location for files to be deleted    -l <path>\n";
 }
+if (!defined $onlyCheckMerged) {
+    $onlyCheckMerged = 0;
+    print "* OPTIONAL: only check merged batches           -m                   (default = $onlyCheckMerged)\n";
+}
 if (!defined $onlyCheckMergeWorthy) {
     $onlyCheckMergeWorthy = 0;
-    print "* OPTIONAL: only check merge worthy batches     -m                   (default = $onlyCheckMergeWorthy)\n";
+    print "* OPTIONAL: only check merge worthy batches     -w                   (default = $onlyCheckMergeWorthy)\n";
 }
 if (!defined $onlyCheckUndeleted) {
@@ -130 +136 @@
         if (!$onDatastore) {next;}
         if ($onlyCheckUndeleted && $deleted) {next;}
-        if ($onlyCheckMergeWorthy && !$mergeWorthy) {next;}
+        if ($onlyCheckMergeWorthy && (!$mergeWorthy || $merged)) {next;}
+        if ($onlyCheckMerged && !$merged) {next;}
 
         my $batch = ippToPsps::Batch->existing(