From 08e6baadf426e53ea6653d0ab92ecdd3623eb183 Mon Sep 17 00:00:00 2001 From: Nicolas Boisselier Date: Sun, 21 Jan 2018 23:38:46 +0000 Subject: [PATCH] bin/dbq --- bin/dbq | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bin/dbq b/bin/dbq index 95ac9bb1..4dbc8b20 100755 --- a/bin/dbq +++ b/bin/dbq @@ -28,7 +28,7 @@ my $VERSION = '0.0.1'; my ($NAME) = $0 =~ m,([^/]+)$,; my $UC_NAME = uc($NAME); my %PARAM = ( - 'format' => $ENV{$UC_NAME.'_FORMAT'} ? $ENV{$UC_NAME.'_FORMAT'} : 'human', + 'format' => $ENV{$UC_NAME.'_FORMAT'} ? $ENV{$UC_NAME.'_FORMAT'} : 'csv', 'config.txt_errors' => $ENV{$UC_NAME.'_TXT_ERRORS'} ? $ENV{$UC_NAME.'_TXT_ERRORS'} : '1', 'rows_head_char' => "\r", ); @@ -113,6 +113,12 @@ my $url = ($ENV{$UC_NAME.'_URL'} ? $ENV{$UC_NAME.'_URL'} : ( -e $ROOT_DIR.'/lib/php/db/dbq.php' ? $ROOT_DIR.'/lib/php/db/dbq.php' : '' ) ); +# /url/... with no domain +if (!$Opt{ssh} and @ARGV and $ARGV[0] =~ m|^/|) { + $url = 'https://api.nbdom.net'.shift(@ARGV); + @EXEC = grep {$_ ne $url} @EXEC; +} + if (!$Opt{ssh} and @ARGV and ($ARGV[0] =~ m|^\w+://| or -e $ARGV[0] )) { $url = shift @ARGV; @EXEC = grep {$_ ne $url} @EXEC; @@ -188,7 +194,7 @@ while (my ($k,$v) = each %PARAM) { # # Parser # -if ( $Opt{cut} ) { +if ($Opt{cut}) { open(STDOUT,"|cut -f $Opt{cut}".($keys{sep} ? " -d '$keys{sep}'" : '')); $keys{format} = 'csv'; $keys{header} = '0' unless defined $keys{header}; -- 2.47.3