Bug 14504: (QA followup) Change argument --criteria to --where

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/misc/cronjobs/delete_items.pl b/misc/cronjobs/delete_items.pl
index 88a6bc0..7d15560 100755 (executable)
--- a/misc/cronjobs/delete_items.pl
+++ b/misc/cronjobs/delete_items.pl
@@ -19,7 +19,7 @@ my $GLOBAL = {
 };
 
 my $OPTIONS = {
-      criteria => []
+      where => []
     , flags    => {
             verbose   => ''
           , commit    => ''
@@ -30,7 +30,7 @@ my $OPTIONS = {
 };
 
 GetOptions(
-      'criteria=s' => $OPTIONS->{criteria}
+      'where=s'    => $OPTIONS->{where}
     , 'v|verbose'  => sub { $OPTIONS->{flags}->{verbose}   = 1 }
     , 'V|version'  => sub { $OPTIONS->{flags}->{version}   = 1 }
     , 'h|help'     => sub { $OPTIONS->{flags}->{help}      = 1 }
@@ -38,17 +38,17 @@ GetOptions(
     , 'c|commit'   => sub { $OPTIONS->{flags}->{commit}    = 1 } # aka DO-EET!
 );
 
-my @criteria = @{ $OPTIONS->{criteria} };
+my @where = @{ $OPTIONS->{where} };
 
 pod2usage( -verbose => 2 ) if  $OPTIONS->{flags}->{manual};
 pod2usage( -verbose => 1 ) if  $OPTIONS->{flags}->{help};
-pod2usage( -verbose => 1 -msg => 'You must supply at least one --criteria option' ) if  scalar @criteria == 0;
+pod2usage( -verbose => 1 -msg => 'You must supply at least one --where option' ) if  scalar @where == 0;
 
 sub verbose {
     say @_ if $OPTIONS->{flags}->{verbose};
 }
 
-my $where_clause = ' where ' . join ( " and ", @criteria );
+my $where_clause = ' where ' . join ( " and ", @where );
 
 verbose "Where statement: $where_clause";
 
@@ -74,7 +74,7 @@ delete_items.pl - A batch item deletion tool, which generates a query against th
 
 delete_items.pl [--help|--manual]
 
-delete_items.pl [--verbose] --criteria "I<SQL CONDITIONAL EXPRESSION>" ... [--commit]
+delete_items.pl [--verbose] --where "I<SQL CONDITIONAL EXPRESSION>" ... [--commit]
 
 =cut
 
@@ -92,12 +92,12 @@ Read the manual, with examples.
 
 =item B<--verbose>
 
-Send the "WHERE" clause generated by the collected C<--criteria>
+Send the "WHERE" clause generated by the collected C<--where>
 arguments, as well as items affected to Standard Out.
 
-=item B<--criteria>
+=item B<--where>
 
-The C<--criteria> option may called multiple times. The following argument
+The C<--where> option may called multiple times. The following argument
 must be a syntactically valid SQL statement which is part of the C<WHERE>
 clause querying the items table. These are joined by C<AND>.
 
@@ -114,9 +114,9 @@ No items will be deleted unless the C<--commit> flag is present.
 
   The following is an example of this script:
 
- delete_items.pl --criteria "items.withdrawn ! 0"  --criteria "items.withdrawn_on < $(date --date="13 month ago" --rfc-3339=date)" --commit
+ delete_items.pl --where "items.withdrawn ! 0"  --where "items.withdrawn_on < $(date --date="13 month ago" --rfc-3339=date)" --commit
 
- delete_items.pl --criteria "itemlost >= '1'" --criteria "itemlost <='4'" --criteria "itemlost_on < '2014-04-28'" --commit
+ delete_items.pl --where "itemlost >= '1'" --where "itemlost <='4'" --where "itemlost_on < '2014-04-28'" --commit
 
 =cut