rename ACTION by PARAM, no more ALIASES

diff --git a/bin/dbq b/bin/dbq
index 7b711be78f8ed4d04af34bb5be5938cc4abfef47..f3e1399fcf177550eb49b22c147309dce0f7bd30 100755 (executable)
--- a/bin/dbq
+++ b/bin/dbq
@@ -22,20 +22,21 @@ my $VERSION = '0.0.1';
 #################################################################################
 my ($NAME) = $0 =~ m,([^/]+)$,;
 my $UC_NAME = uc($NAME);
-my %ACTION = (
+my %PARAM = (
   'format' => $ENV{$UC_NAME.'_FORMAT'} ? $ENV{$UC_NAME.'_FORMAT'} : 'nc',
-  'action' => $ENV{$UC_NAME.'_ACTION'} ? $ENV{$UC_NAME.'_ACTION'} : 'rows',
+# NB 09.04.16   'action' => $ENV{$UC_NAME.'_PARAM'} ? $ENV{$UC_NAME.'_PARAM'} : 'rows',
   'db' => $ENV{$UC_NAME.'_DB'} ? $ENV{$UC_NAME.'_DB'} : '',
   'txt_errors' => $ENV{$UC_NAME.'_TXT_ERRORS'} ? $ENV{$UC_NAME.'_TXT_ERRORS'} : '1',
 );
+%PARAM = map {$_=>$PARAM{$_}} grep {$PARAM{$_} ne ''} keys %PARAM;
 
 my %CMD_ALIASE = (
-  'd' => 'db',
-  't' => 'table',
-  'f' => 'format',
-  'l' => 'limit',
-  'a' => 'action',
-  'h' => 'header',
+# NB 09.04.16   'd' => 'db',
+# NB 09.04.16   't' => 'table',
+# NB 09.04.16   'f' => 'format',
+# NB 09.04.16   'l' => 'limit',
+# NB 09.04.16   'a' => 'action',
+# NB 09.04.16   'h' => 'header',
 );
 
 ## Vim: r!% --curl_help_hash | grep X
@@ -139,17 +140,13 @@ while ($_ = shift @ARGV) {
 }
 
 #
-# Defaults Actions
+# Defaults Params
 #
-while (my ($k,$v) = each %ACTION) {
+while (my ($k,$v) = each %PARAM) {
   next if $keys{$k};
   $keys{$k} = $v;
 }
 
-# NB 07.03.16 $keys{header} = '0' if !defined($keys{header}) and (
-# NB 07.03.16   $keys{action} ne 'rows'
-# NB 07.03.16   or $keys{format} ne 'nc'
-# NB 07.03.16 );
 $keys{table} = $1 if $keys{db} and $keys{db} =~ s/:(.*)$//;
 
 #################################################################################