--- daq.js.orig 2011-11-25 15:15:42.000000000 +0900 +++ daq.js 2011-11-30 13:24:57.000000000 +0900 @@ -15,17 +15,18 @@ /** * repeatGetState1 "getstate(./daq.py/Log')" wtih the specified count, times. */ + var interval_running = 0; + var myInterval; function repeatGetState(times) { - var i = 0; - setInterval(( - function() { - getstate('./daq.py/Log'); - i++; - if ((times != 0) && (i == times)) { - clearInterval(); - } - } - ), 2000); // 2 sec. + // alert("repeatGetState()" + interval_running); + if (interval_running == 1) { + clearInterval(myInterval); + } + // alert("repeatGetState(): before set interval"); + var my_command = "getstate('./daq.py/Log')" + myInterval = setInterval(my_command, 2000); + interval_running = 1; + // alert("repeatGetState(): exit"); } /** @@ -127,7 +128,7 @@ var status = res.getElementsByTagName('status'); $("commandStatus").innerHTML = status[0].firstChild.nodeValue; var states = res.getElementsByTagName('state'); - var currentstatus = states[0].firstChild.nodeValue; + var currentstate = states[0].firstChild.nodeValue; var compStatus = res.getElementsByTagName('compStatus'); var eventnums = res.getElementsByTagName('eventNum'); var length = states.length; @@ -152,14 +153,22 @@ //alert(text); $("DAQStatus").innerHTML = text; - if(currentstate == "LOADED") - change2Loaded1(); - else if (currentstate == "CONFIGURED") - change2Configured1(); - else if (currentstat == "RUNNING") - change2Running1(); - else if (currentstat == "PAUSED") - change2Paused1(); + if(currentstate == "LOADED") { + //alert("currentstate: LOADED"); + change2Loaded(); + } + else if (currentstate == "CONFIGURED") { + //alert("currentstate: CONFIGURED"); + change2Configured(); + } + else if (currentstate == "RUNNING") { + //alert("currentstate: RUNNING"); + change2Running(); + } + else if (currentstate == "PAUSED") { + //alert("currentstate: PAUSED"); + change2Paused(); + } }, onFailure:function(httpObj){ // alert("Bad: "+ httpObj.responseText);