Commit 3b74d28a authored by Matteo Quintiliani's avatar Matteo Quintiliani

Added macros CURRENT_NETWORK

Changed parameters in nmxp_receiveData()
Changed parameters in nmxp_receiveData()


git-svn-id: file:///home/quintiliani/svncopy/nmxptool/trunk@133 3cd66e75-5955-46cb-a940-c26e5fc5497d
parent 7806872c
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
#endif #endif
#define CURRENT_NETWORK (params.network)? params.network : DEFAULT_NETWORK
typedef struct { typedef struct {
int significant; int significant;
double last_time; double last_time;
...@@ -150,9 +152,9 @@ int main (int argc, char **argv) { ...@@ -150,9 +152,9 @@ int main (int argc, char **argv) {
/* Separate station_code and channel_code */ /* Separate station_code and channel_code */
if(nmxp_chan_cpy_sta_chan(channelList_subset->channel[i_chan].name, station_code, channel_code)) { if(nmxp_chan_cpy_sta_chan(channelList_subset->channel[i_chan].name, station_code, channel_code)) {
nmxp_log(0, 1, "%s.%s.%s\n", (params.network)? params.network : DEFAULT_NETWORK, station_code, channel_code); nmxp_log(0, 1, "%s.%s.%s\n", CURRENT_NETWORK, station_code, channel_code);
strcpy(msr_list_chan[i_chan]->network, (params.network)? params.network : DEFAULT_NETWORK); strcpy(msr_list_chan[i_chan]->network, CURRENT_NETWORK);
strcpy(msr_list_chan[i_chan]->station, station_code); strcpy(msr_list_chan[i_chan]->station, station_code);
strcpy(msr_list_chan[i_chan]->channel, channel_code); strcpy(msr_list_chan[i_chan]->channel, channel_code);
...@@ -226,7 +228,7 @@ int main (int argc, char **argv) { ...@@ -226,7 +228,7 @@ int main (int argc, char **argv) {
if(params.flag_writefile) { if(params.flag_writefile) {
/* Open output file */ /* Open output file */
sprintf(filename, "%s.%s.%d.%d.%d.nmx", sprintf(filename, "%s.%s.%d.%d.%d.nmx",
(params.network)? params.network : DEFAULT_NETWORK, CURRENT_NETWORK,
channelList_subset->channel[i_chan].name, channelList_subset->channel[i_chan].name,
channelList_subset->channel[i_chan].key, channelList_subset->channel[i_chan].key,
params.start_time, params.end_time); params.start_time, params.end_time);
...@@ -241,7 +243,7 @@ int main (int argc, char **argv) { ...@@ -241,7 +243,7 @@ int main (int argc, char **argv) {
if(params.flag_writeseed) { if(params.flag_writeseed) {
/* Open output Mini-SEED file */ /* Open output Mini-SEED file */
sprintf(data_seed.filename_mseed, "%s.%s.%d.%d.%d.miniseed", sprintf(data_seed.filename_mseed, "%s.%s.%d.%d.%d.miniseed",
(params.network)? params.network : DEFAULT_NETWORK, CURRENT_NETWORK,
channelList_subset->channel[i_chan].name, channelList_subset->channel[i_chan].name,
channelList_subset->channel[i_chan].key, channelList_subset->channel[i_chan].key,
params.start_time, params.start_time,
...@@ -262,7 +264,7 @@ int main (int argc, char **argv) { ...@@ -262,7 +264,7 @@ int main (int argc, char **argv) {
/* Write SNCL line */ /* Write SNCL line */
fprintf(outfile, "%s.%s.%s.%s\n", fprintf(outfile, "%s.%s.%s.%s\n",
station_code, station_code,
(params.network)? params.network : DEFAULT_NETWORK, CURRENT_NETWORK,
channel_code, channel_code,
(params.location)? params.location : ""); (params.location)? params.location : "");
} }
...@@ -276,7 +278,7 @@ int main (int argc, char **argv) { ...@@ -276,7 +278,7 @@ int main (int argc, char **argv) {
while(ret == NMXP_SOCKET_OK && type != NMXP_MSG_READY) { while(ret == NMXP_SOCKET_OK && type != NMXP_MSG_READY) {
/* Process a packet and return value in NMXP_DATA_PROCESS structure */ /* Process a packet and return value in NMXP_DATA_PROCESS structure */
pd = nmxp_processCompressedData(buffer, length, channelList_subset); pd = nmxp_processCompressedData(buffer, length, channelList_subset, CURRENT_NETWORK);
/* Log contents of last packet */ /* Log contents of last packet */
if(params.flag_logdata) { if(params.flag_logdata) {
...@@ -415,7 +417,7 @@ int main (int argc, char **argv) { ...@@ -415,7 +417,7 @@ int main (int argc, char **argv) {
if(params.flag_writeseed) { if(params.flag_writeseed) {
/* Open output Mini-SEED file */ /* Open output Mini-SEED file */
sprintf(data_seed.filename_mseed, "%s.realtime.miniseed", sprintf(data_seed.filename_mseed, "%s.realtime.miniseed",
(params.network)? params.network : DEFAULT_NETWORK); CURRENT_NETWORK);
data_seed.outfile_mseed = fopen(data_seed.filename_mseed, "w"); data_seed.outfile_mseed = fopen(data_seed.filename_mseed, "w");
if(!data_seed.outfile_mseed) { if(!data_seed.outfile_mseed) {
...@@ -428,7 +430,7 @@ int main (int argc, char **argv) { ...@@ -428,7 +430,7 @@ int main (int argc, char **argv) {
while(1) { while(1) {
/* Process Compressed or Decompressed Data */ /* Process Compressed or Decompressed Data */
pd = nmxp_receiveData(naqssock, channelList_subset); pd = nmxp_receiveData(naqssock, channelList_subset, CURRENT_NETWORK);
/* Log contents of last packet */ /* Log contents of last packet */
if(params.flag_logdata) { if(params.flag_logdata) {
......
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