Commit da2b683b authored by Matteo Quintiliani's avatar Matteo Quintiliani

Changed DAP loop, continue in development, there is something does not work


git-svn-id: file:///home/quintiliani/svncopy/nmxptool/trunk@172 3cd66e75-5955-46cb-a940-c26e5fc5497d
parent 7d6fc59d
...@@ -204,12 +204,6 @@ int main (int argc, char **argv) { ...@@ -204,12 +204,6 @@ int main (int argc, char **argv) {
params.end_time = params.start_time + span_interval; params.end_time = params.start_time + span_interval;
} }
exitdapcondition = 1;
while(exitdapcondition) {
nmxp_log(0, 1, "start_time = %d - end_time = %d\n", params.start_time, params.end_time);
/* ************************************************************** */ /* ************************************************************** */
/* Start subscription protocol "DATA ACCESS PROTOCOL" version 1.0 */ /* Start subscription protocol "DATA ACCESS PROTOCOL" version 1.0 */
...@@ -239,6 +233,12 @@ int main (int argc, char **argv) { ...@@ -239,6 +233,12 @@ int main (int argc, char **argv) {
return 1; return 1;
} }
exitdapcondition = 1;
while(exitdapcondition) {
nmxp_log(0, 1, "start_time = %d - end_time = %d\n", params.start_time, params.end_time);
/* Start loop for sending requests */ /* Start loop for sending requests */
i_chan=0; i_chan=0;
request_SOCKET_OK = NMXP_SOCKET_OK; request_SOCKET_OK = NMXP_SOCKET_OK;
...@@ -320,7 +320,7 @@ int main (int argc, char **argv) { ...@@ -320,7 +320,7 @@ int main (int argc, char **argv) {
nmxptool_check_and_log_gap(pd->time, channelListSeq[cur_chan].last_time, GAP_TOLLERANCE, pd->station, pd->channel); nmxptool_check_and_log_gap(pd->time, channelListSeq[cur_chan].last_time, GAP_TOLLERANCE, pd->station, pd->channel);
} }
} }
if(channelListSeq[cur_chan].significant) { if(channelListSeq[cur_chan].significant && pd->nSamp > 0) {
channelListSeq[cur_chan].last_time = pd->time + ((double) pd->nSamp / (double) pd->sampRate); channelListSeq[cur_chan].last_time = pd->time + ((double) pd->nSamp / (double) pd->sampRate);
} }
...@@ -389,17 +389,6 @@ int main (int argc, char **argv) { ...@@ -389,17 +389,6 @@ int main (int argc, char **argv) {
} }
/* DAP Step 7: Repeat steps 5 and 6 for each data request */ /* DAP Step 7: Repeat steps 5 and 6 for each data request */
/* DAP Step 8: Send a Terminate message (optional) */
nmxp_sendTerminateSubscription(naqssock, NMXP_SHUTDOWN_NORMAL, "Bye!");
/* DAP Step 9: Close the socket */
nmxp_closeSocket(naqssock);
/* ************************************************************ */
/* End subscription protocol "DATA ACCESS PROTOCOL" version 1.0 */
/* ************************************************************ */
if(params.delay > 0) { if(params.delay > 0) {
time_to_sleep = (params.end_time - params.start_time) - (time(NULL) - (params.start_time + params.delay + span_interval)); time_to_sleep = (params.end_time - params.start_time) - (time(NULL) - (params.start_time + params.delay + span_interval));
if(time_to_sleep >= 0) { if(time_to_sleep >= 0) {
...@@ -417,6 +406,17 @@ int main (int argc, char **argv) { ...@@ -417,6 +406,17 @@ int main (int argc, char **argv) {
} /* END while(exitdapcondition) */ } /* END while(exitdapcondition) */
/* DAP Step 8: Send a Terminate message (optional) */
nmxp_sendTerminateSubscription(naqssock, NMXP_SHUTDOWN_NORMAL, "Bye!");
/* DAP Step 9: Close the socket */
nmxp_closeSocket(naqssock);
/* ************************************************************ */
/* End subscription protocol "DATA ACCESS PROTOCOL" version 1.0 */
/* ************************************************************ */
} else { } else {
...@@ -495,7 +495,7 @@ int main (int argc, char **argv) { ...@@ -495,7 +495,7 @@ int main (int argc, char **argv) {
nmxptool_check_and_log_gap(pd->time, channelListSeq[cur_chan].last_time, GAP_TOLLERANCE, pd->station, pd->channel); nmxptool_check_and_log_gap(pd->time, channelListSeq[cur_chan].last_time, GAP_TOLLERANCE, pd->station, pd->channel);
} }
} }
if(channelListSeq[cur_chan].significant) { if(channelListSeq[cur_chan].significant && pd->nSamp > 0) {
channelListSeq[cur_chan].last_time = pd->time + ((double) pd->nSamp / (double) pd->sampRate); channelListSeq[cur_chan].last_time = pd->time + ((double) pd->nSamp / (double) pd->sampRate);
} }
......
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