Commit 6c50e366 authored by Matteo Quintiliani's avatar Matteo Quintiliani

Changed the output list of channels from NaqsServer, in order to create

automatically a state file. (involved option -L)


git-svn-id: file:///home/quintiliani/svncopy/nmxptool/trunk@1362 3cd66e75-5955-46cb-a940-c26e5fc5497d
parent c29c1e7e
......@@ -2,16 +2,18 @@
nmxptool Release History
#########################
* Release 1.2.5-beta1 (2010/09/01)
* Release 1.2.5-beta1 (2010/09/14)
- Improved saving of mini-SEED files, now data samples are saved using
the whole available space within the mini-SEED records.
- Added capability to choose the mini-SEED record length (option -r).
- Added capability, using libmseed, to choose mini-SEED record length (option -r).
- Added capability, using libmseed, to choose between steim1 and steim2
compression (option -x), and data quality indicator (option -q). (R. Racine)
- Added feature: enabled ShortTermCompletion also in Earthworm configuration.
(Short-Term-Completion has been implemented in NaqsServer version 2.1)
- Added feature: within state file it is now allowed to insert white spaces,
tabs, and comment string by '#'. (involved option -F)
- Changed the output list of channels from NaqsServer, in order to create
automatically a state file. (involved option -L)
- Fixed some memory leaks and potential other memory bugs. (R. Racine)
* Release 1.2.4 (2009/12/22)
......
......@@ -7,7 +7,7 @@
* Istituto Nazionale di Geofisica e Vulcanologia - Italy
* quintiliani@ingv.it
*
* $Id: nmxp_chan.h,v 1.26 2009-08-31 12:16:41 mtheo Exp $
* $Id: nmxp_chan.h,v 1.27 2010-09-14 09:38:52 mtheo Exp $
*
*/
......@@ -241,9 +241,11 @@ void nmxp_chan_print_channelList(NMXP_CHAN_LIST *channelList);
*
* \param channelList Channel List
* \param sta_chan_list Channel pattern list
* \param flag_statefile If it is not zero the output can be redirected to
* create an input state file. Otherwise a more human readable output.
*
*/
void nmxp_chan_print_channelList_with_match(NMXP_CHAN_LIST *channelList, char *sta_chan_list);
void nmxp_chan_print_channelList_with_match(NMXP_CHAN_LIST *channelList, char *sta_chan_list, int flag_statefile);
/*! Print channel information
......
......@@ -7,7 +7,7 @@
* Istituto Nazionale di Geofisica e Vulcanologia - Italy
* quintiliani@ingv.it
*
* $Id: nmxp_chan.c,v 1.46 2010-04-12 13:23:43 mtheo Exp $
* $Id: nmxp_chan.c,v 1.47 2010-09-14 09:38:52 mtheo Exp $
*
*/
......@@ -416,7 +416,7 @@ void nmxp_chan_print_channelList(NMXP_CHAN_LIST *channelList) {
}
void nmxp_chan_print_channelList_with_match(NMXP_CHAN_LIST *channelList, char *sta_chan_list) {
void nmxp_chan_print_channelList_with_match(NMXP_CHAN_LIST *channelList, char *sta_chan_list, int flag_statefile) {
int chan_number = 0;
int i_chan = 0;
int ret_match = 0;
......@@ -452,12 +452,19 @@ void nmxp_chan_print_channelList_with_match(NMXP_CHAN_LIST *channelList, char *s
ret_match = 1;
}
if(ret_match == 1) {
nmxp_log(NMXP_LOG_NORM_NO, NMXP_LOG_D_ANY, "%04d %12d %6s%c%-11s\n",
i_chan+1,
channelList->channel[i_chan].key,
" ",
' ',
NMXP_LOG_STR(channelList->channel[i_chan].name));
if(flag_statefile) {
nmxp_log(NMXP_LOG_NORM_NO, NMXP_LOG_D_ANY, "%-11s # %12d\n",
NMXP_LOG_STR(channelList->channel[i_chan].name),
channelList->channel[i_chan].key
);
} else {
nmxp_log(NMXP_LOG_NORM_NO, NMXP_LOG_D_ANY, "%04d %12d %6s%c%-11s\n",
i_chan+1,
channelList->channel[i_chan].key,
" ",
' ',
NMXP_LOG_STR(channelList->channel[i_chan].name));
}
}
}
} else {
......
......@@ -7,7 +7,7 @@
* Istituto Nazionale di Geofisica e Vulcanologia - Italy
* quintiliani@ingv.it
*
* $Id: nmxptool.c,v 1.229 2010-09-03 06:58:16 mtheo Exp $
* $Id: nmxptool.c,v 1.230 2010-09-14 09:38:52 mtheo Exp $
*
*/
......@@ -270,7 +270,7 @@ int main (int argc, char **argv) {
channelList = nmxp_getAvailableChannelList(params.hostname, params.portnumberpds, NMXP_DATA_TIMESERIES, nmxptool_sigcondition_read);
/* nmxp_chan_print_channelList(channelList); */
nmxp_chan_print_channelList_with_match(channelList, params.channels);
nmxp_chan_print_channelList_with_match(channelList, params.channels, 1);
return 1;
......
......@@ -7,7 +7,7 @@
* Istituto Nazionale di Geofisica e Vulcanologia - Italy
* quintiliani@ingv.it
*
* $Id: nmxptool_getoptlong.c,v 1.123 2010-09-03 06:58:16 mtheo Exp $
* $Id: nmxptool_getoptlong.c,v 1.124 2010-09-14 09:38:52 mtheo Exp $
*
*/
......@@ -210,7 +210,7 @@ Main arguments:\n\
appending the suffix '%s'.\n\
It enables the option -b in order to allow data continuity\n\
when short disconnections occur or between program restarts.\n\
Related to -A and -f. DO NOT USE with -C.\n",
Related to -L, -A and -f. DO NOT USE with -C.\n",
NMXP_STR_STATE_EXT
);
......@@ -271,6 +271,8 @@ DEFAULT_USEC / 1000, DEFAULT_N_CHANNEL, NMXP_MAX_MSCHAN_MSEC / 1000);
nmxp_log(NMXP_LOG_NORM_NO, NMXP_LOG_D_ANY, "\
-L, --listchannelsnaqs List of the available Time Series channels on NaqsServer.\n\
The output list of channels can be redirected to a file\n\
which can be used as an input statefile for the option -F.\n\
-M, --maxlatency=SECs Max tolerable latency (default %d) [%d..%d].\n\
Enable NaqsServer to send out retransmission requests\n\
for missed packets. Inside the section NetworkInterface\n\
......
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