Commit 2e8eb86c authored by Matteo Quintiliani's avatar Matteo Quintiliani

Add check in nmxp_chan_subset() for channel duplication


git-svn-id: file:///home/quintiliani/svncopy/nmxptool/trunk@833 3cd66e75-5955-46cb-a940-c26e5fc5497d
parent bd8ca099
TODO LIST: TODO LIST:
- Add check for channel duplication in sta_chan_list
nmxp_chan_subset() in libnmxp/src/nmxp_chan.c
- nmxp_log() check for NULL string - nmxp_log() check for NULL string
- Add option for output directory dump and mini-seed - Add option for output directory dump and mini-seed
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Istituto Nazionale di Geofisica e Vulcanologia - Italy * Istituto Nazionale di Geofisica e Vulcanologia - Italy
* quintiliani@ingv.it * quintiliani@ingv.it
* *
* $Id: nmxp_chan.c,v 1.33 2008-02-28 13:58:57 mtheo Exp $ * $Id: nmxp_chan.c,v 1.34 2008-02-29 16:23:53 mtheo Exp $
* *
*/ */
...@@ -299,6 +299,7 @@ NMXP_CHAN_LIST_NET *nmxp_chan_subset(NMXP_CHAN_LIST *channelList, NMXP_DATATYPE ...@@ -299,6 +299,7 @@ NMXP_CHAN_LIST_NET *nmxp_chan_subset(NMXP_CHAN_LIST *channelList, NMXP_DATATYPE
while(i_chan < channelList->number && ret_match != -1) { while(i_chan < channelList->number && ret_match != -1) {
ret_match = nmxp_chan_match(channelList->channel[i_chan].name, sta_chan_code_pattern); ret_match = nmxp_chan_match(channelList->channel[i_chan].name, sta_chan_code_pattern);
if(ret_match == 1) { if(ret_match == 1) {
/* TODO Add check for channel duplication in sta_chan_list */
if(i_chan != -1 && getDataTypeFromKey(channelList->channel[i_chan].key) == dataType) { if(i_chan != -1 && getDataTypeFromKey(channelList->channel[i_chan].key) == dataType) {
ret_channelList->channel[ret_channelList->number].key = channelList->channel[i_chan].key; ret_channelList->channel[ret_channelList->number].key = channelList->channel[i_chan].key;
strcpy(ret_channelList->channel[ret_channelList->number].name, channelList->channel[i_chan].name); strcpy(ret_channelList->channel[ret_channelList->number].name, channelList->channel[i_chan].name);
......
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