Commit 4ea90b69 authored by Matteo Quintiliani's avatar Matteo Quintiliani

Changed description and removed flag --quiet


git-svn-id: file:///home/quintiliani/svncopy/nmxptool/trunk@122 3cd66e75-5955-46cb-a940-c26e5fc5497d
parent 79fa1f4a
...@@ -55,6 +55,10 @@ int main (int argc, char **argv) { ...@@ -55,6 +55,10 @@ int main (int argc, char **argv) {
return 1; return 1;
} }
if(params.flag_verbose) {
nmxp_log(-1, 2);
}
/* List available channels on server */ /* List available channels on server */
if(params.flag_listchannels) { if(params.flag_listchannels) {
......
...@@ -33,22 +33,22 @@ const NMXPTOOL_PARAMS NMXPTOOL_PARAMS_DEFAULT = ...@@ -33,22 +33,22 @@ const NMXPTOOL_PARAMS NMXPTOOL_PARAMS_DEFAULT =
void nmxptool_usage(struct option long_options[]) void nmxptool_usage(struct option long_options[])
{ {
printf("\ printf("\
%s %s, Nanometrics tool (Data Access Protocol 1.0, Private Data Stream 1.4)\n\n\ %s %s, Nanometrics tool (Data Access Protocol 1.0, Private Data Stream 1.4)\n\
\n\
Usage: %s -H hostname --listchannels [...]\n\ Usage: %s -H hostname --listchannels [...]\n\
Receive list of available channels on the host\n\ Receive list of available channels on the host\n\
\n\ \n\
%s -H hostname -C channellist [...]\n\ %s -H hostname -C channellist [...]\n\
Receive data by PDS\n\ Receive data from hostname by PDS\n\
\n\ \n\
%s -H hostname -C channellist -s DATE -e DATE [...]\n\ %s -H hostname -C channellist -s DATE -e DATE [...]\n\
Receive data by DAP\n\ Receive data from hostname by DAP\n\
\n\ \n\
Arguments:\n\ Arguments:\n\
-H, --hostname=HOST Nanometrics hostname.\n\ -H, --hostname=HOST Nanometrics hostname.\n\
-C, --channels=LIST Channel list STA1.CHAN1,STA2.CHAN2,...\n\ -C, --channels=LIST Channel list STA1.HH?,STA2.??Z,...\n\
-s, --start_time=DATE Start time in date format. ONLY DAP.\n\ -s, --start_time=DATE Start time in date format. ONLY DAP.\n\
-e, --end_time=DATE End time in date format. ONLY DAP.\n\ -e, --end_time=DATE End time in date format. ONLY DAP.\n\
\n\
DATE can be in formats:\n\ DATE can be in formats:\n\
<date>,<time> | <date>\n\ <date>,<time> | <date>\n\
where:\n\ where:\n\
...@@ -74,7 +74,6 @@ Optional arguments:\n\ ...@@ -74,7 +74,6 @@ Optional arguments:\n\
\n\ \n\
Flags:\n\ Flags:\n\
-v, --verbose Be verbose.\n\ -v, --verbose Be verbose.\n\
-q, --quiet Quiet (almost no output).\n\
-b, --buffered Receive recent packets into the past. ONLY PDS.\n\ -b, --buffered Receive recent packets into the past. ONLY PDS.\n\
-l, --listchannels Output list of channel available on NaqsServer.\n", -l, --listchannels Output list of channel available on NaqsServer.\n",
DEFAULT_PORT_PDS, DEFAULT_PORT_PDS,
...@@ -98,6 +97,7 @@ Flags:\n\ ...@@ -98,6 +97,7 @@ Flags:\n\
printf("\n\ printf("\n\
-h, --help Print this help.\n\ -h, --help Print this help.\n\
\n\ \n\
Matteo Quintiliani - Istituto Nazionale di Geofisica e Vulcanologia - Italy\n\
Mail bug reports and suggestions to <%s>.\n", Mail bug reports and suggestions to <%s>.\n",
PACKAGE_BUGREPORT PACKAGE_BUGREPORT
); );
...@@ -138,7 +138,6 @@ int nmxptool_getopt_long(int argc, char **argv, NMXPTOOL_PARAMS *params) ...@@ -138,7 +138,6 @@ int nmxptool_getopt_long(int argc, char **argv, NMXPTOOL_PARAMS *params)
{"password", required_argument, 0, 'p'}, {"password", required_argument, 0, 'p'},
/* Following are flags */ /* Following are flags */
{"verbose", no_argument, 0, 'v'}, {"verbose", no_argument, 0, 'v'},
{"quiet", no_argument, 0, 'q'},
{"buffered", no_argument, 0, 'b'}, {"buffered", no_argument, 0, 'b'},
{"listchannels", no_argument, 0, 'l'}, {"listchannels", no_argument, 0, 'l'},
#ifdef HAVE_LIBMSEED #ifdef HAVE_LIBMSEED
...@@ -173,7 +172,7 @@ int nmxptool_getopt_long(int argc, char **argv, NMXPTOOL_PARAMS *params) ...@@ -173,7 +172,7 @@ int nmxptool_getopt_long(int argc, char **argv, NMXPTOOL_PARAMS *params)
/* init params */ /* init params */
memcpy(params, &NMXPTOOL_PARAMS_DEFAULT, sizeof(NMXPTOOL_PARAMS_DEFAULT)); memcpy(params, &NMXPTOOL_PARAMS_DEFAULT, sizeof(NMXPTOOL_PARAMS_DEFAULT));
char optstr[100] = "H:P:D:C:N:L:S:R:s:e:u:p:vqblwh"; char optstr[100] = "H:P:D:C:N:L:S:R:s:e:u:p:vblwh";
#ifdef HAVE_LIBMSEED #ifdef HAVE_LIBMSEED
strcat(optstr, "m"); strcat(optstr, "m");
...@@ -264,10 +263,6 @@ int nmxptool_getopt_long(int argc, char **argv, NMXPTOOL_PARAMS *params) ...@@ -264,10 +263,6 @@ int nmxptool_getopt_long(int argc, char **argv, NMXPTOOL_PARAMS *params)
params->flag_verbose = 1; params->flag_verbose = 1;
break; break;
case 'q':
params->flag_verbose = 0;
break;
case 'b': case 'b':
params->flag_buffered = 1; params->flag_buffered = 1;
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment