merge with spawn branch

[brisk.git] / web / xhr.js

diff --git a/web/xhr.js b/web/xhr.js
index ca1a2a0..c3816a6 100644 (file)
--- a/web/xhr.js
+++ b/web/xhr.js
@@ -1,7 +1,10 @@
 /*
  *  brisk - xhr.js
  *
- *  Copyright (C) 2006 matteo.nastasi@milug.org
+ *  Copyright (C) 2006-2008 Matteo Nastasi
+ *                          mailto: nastasi@alternativeoutput.it 
+ *                                  matteo.nastasi@milug.org
+ *                          web: http://www.alternativeoutput.it
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,6 +36,14 @@ var the_end = false;
 var ct = 0;
 var watchdog = 0;
 
+function hbit(symb)
+{
+    if ($("heartbit").innerHTML.length >= 40)
+       $("heartbit").innerHTML = symb;
+    else
+       $("heartbit").innerHTML += symb;
+}
+
 function xhr_rd_cb(xhr_rd) 
 {
     var ret;
@@ -60,7 +71,8 @@ function xhr_rd_start(sess,stat,subst,step)
     xhr_rd_newctx = "";
 
     /* NOTE document.uniqueID exists only under IE  */
-    // alert("di qui3");
+    // if (g_is_spawn == 1)
+    // alert("di qui3: "+(g_is_spawn == 1 ? "&table_idx="+g_table_idx : ""));
     xhr_rd.open('GET', 'index_rd.php?sess='+sess+"&stat="+stat+"&subst="+subst+"&step="+step+"&onlyone="+(document.uniqueID ? "TRUE" : "FALSE")+"&myfrom="+myfrom, true);
     //    try { 
     xhr_rd.onreadystatechange = function() { xhr_rd_cb(xhr_rd); }
@@ -91,9 +103,7 @@ function xhr_rd_poll(sess)
        $("sandbox").innerHTML = zug;
 
     /* heartbit log */
-    $("heartbit").innerHTML += "_";
-    if ($("heartbit").innerHTML.length == 20)
-       $("heartbit").innerHTML = "_";
+    hbit("_");
     
     do {
        again = 0;
@@ -108,6 +118,8 @@ function xhr_rd_poll(sess)
            singlecomm = gst.comms.shift();
            // alert("EXE"+gugu);
            // $("xhrdeltalog").innerHTML = "EVALL: "+singlecomm.replace("<", "&lt;", "g"); +"<br>";
+           hbit("+");
+
            eval(singlecomm);
            again = 1;
        }
@@ -132,9 +144,7 @@ function xhr_rd_poll(sess)
                    watchdog = 0;
                    setTimeout(xhr_rd_poll, tout, sess);
                    
-                   $("heartbit").innerHTML += "-";
-                   if ($("heartbit").innerHTML.length == 20)
-                       $("heartbit").innerHTML = "-";
+                   // hbit(".");
                    
                }
                return;
@@ -159,6 +169,8 @@ function xhr_rd_poll(sess)
                var delta = 0;
                var match_lines = /^_*$/;
 
+               hbit("/\\");
+
                // check for the same command group
                if (xhr_rd_old_n != xhr_rd_cur_n) {
                    xhr_rd_old_n = xhr_rd_cur_n;
@@ -223,9 +235,7 @@ function xhr_rd_poll(sess)
     if (the_end != true) {
        setTimeout(xhr_rd_poll, tout, sess);
        
-       $("heartbit").innerHTML += "-";
-       if ($("heartbit").innerHTML.length == 20)
-           $("heartbit").innerHTML = "-";
+       // hbit(".");
        
     }
     return;