X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Ftest1%2Findex.html;h=6ea1e45c76cebd8a1ce487290af13f750faa8a7d;hb=eca54f46680e3da32c28be81f127be97049b6edb;hp=23a3c8940c7b734b7bf522f0419593d09dcf9001;hpb=0633d52035149cb50dcbf019d6967a6e120e4a0f;p=pazpar2-moved-to-github.git

diff --git a/www/test1/index.html b/www/test1/index.html
index 23a3c89..6ea1e45 100644
--- a/www/test1/index.html
+++ b/www/test1/index.html
@@ -103,7 +103,7 @@ function show_records()
     var xml = xshow.responseXML;
     var body = document.getElementById("body");
     var hits = xml.getElementsByTagName("hit");
-    if (!hits[0])
+    if (!hits[0]) // We should never get here with blocking operations
     {
 	body.innerHTML = "No records yet";
 	searchtimer = setTimeout(check_search, 250);
@@ -141,12 +141,12 @@ function show_records()
 	}
 	shown++;
 	if (shown < 5)
-	    searchtimer = setTimeout(check_search, 400);
-	else if (shown < 10)
 	    searchtimer = setTimeout(check_search, 1000);
 	else
-	    searchtimer = setTimeout(check_search, 4000);
+	    searchtimer = setTimeout(check_search, 2000);
     }
+    if (!termtimer)
+	termtimer = setTimeout(check_termlist, 1000);
 }
 
 function check_search()
@@ -155,7 +155,8 @@ function check_search()
     var url = "search.pz2?" +
         "command=show" +
 	"&start=" + startrec +
-	"&session=" + session;
+	"&session=" + session +
+	"&block=1";
     xshow = GetXmlHttpObject();
     xshow.onreadystatechange=show_records;
     xshow.open("GET", url);
@@ -174,13 +175,15 @@ function show_termlist()
 {
     if (xtermlist.readyState != 4)
 	return;
+
     var i;
     var xml = xtermlist.responseXML;
     var body = document.getElementById("termlist");
     var hits = xml.getElementsByTagName("term");
     if (!hits[0])
     {
-	termtimer = (check_termlist, 1000);
+	termtimer = setTimeout(check_termlist, 1000);
+        
     }
     else
     {
@@ -270,17 +273,20 @@ function search_started()
 	alert(msg);
 	return;
     }
-    searchtimer = setTimeout(check_search, 250);
-    termtimer = setTimeout(check_termlist, 1000);
+    check_search();
     stattimer = setTimeout(check_stat, 1000);
 }
 
 function start_search()
 {
     clearTimeout(termtimer);
+    termtimer = 0;
     clearTimeout(searchtimer);
+    searchtimer = 0;
     clearTimeout(stattimer);
+    stattimer = 0;
     clearTimeout(showtimer);
+    showtimer = 0;
     if (!targets_loaded)
     {
 	alert("Please load targets first");