allungata attesa a 600 msec

diff --git a/web/index_rd.php b/web/index_rd.php
index 4565b54..5b4f473 100644 (file)
--- a/web/index_rd.php
+++ b/web/index_rd.php
@@ -49,13 +49,6 @@ function unrecerror()
   return (sprintf('the_end=true; window.onunload = null; document.location.assign("index.php");'));
 }
 
-function page_sync($page)
-{
-  GLOBAL $is_page_streaming;
-
-  $is_page_streaming = TRUE;
-  return (sprintf('the_end=true; window.onunload = null; document.location.assign("%s");', $page));
-}
 
 
 
@@ -65,16 +58,14 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
   GLOBAL $is_page_streaming, $first_loop;
   
   $ret = FALSE;
-  $bri = FALSE;
-
-  log_rd2($sess, "M");
+  
+  
   /* Sync check (read only without modifications */
   ignore_user_abort(TRUE);
   if (($sem = lock_data()) != FALSE) { 
+    $bri = &load_data();
     // Aggiorna l'expire time lato server
     if  ($first_loop == TRUE) {
-      log_rd2($sess, "F");
-      $bri = &load_data();
       if (($user = &$bri->get_user($sess, $idx)) == FALSE) {
        unlock_data($sem);
         ignore_user_abort(FALSE);
@@ -95,24 +86,12 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
     return (FALSE);
   }
     
-  if (($proxy_step = step_get($sess)) != FALSE) {
-    // log_rd2($sess, "Postget".$proxy_step."zizi");
-
-    if ($cur_step == $proxy_step) {
-      log_rd2($sess, "P");
-      return;
-    }
-  }
-
-  if ($bri == FALSE)
-    $bri = &load_data();
-
   if (($user = &$bri->get_user($sess, $idx)) == FALSE) {
     return (unrecerror());
   }
 
   /* Nothing changed, return. */
-  if ($cur_step == $user->step) 
+  if ($cur_stat == $user->stat && $cur_step == $user->step) 
     return;
 
   log_rd2($sess, "do other ++".$cur_stat."++".$user->stat."++".$cur_step."++".$user->step);
@@ -183,12 +162,6 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
     if ($cur_step < $user->step) {
       do {
        if ($cur_step + COMM_N < $user->step) {
-         if (($cur_stat != $user->stat)) {
-           $to_stat = $user->stat;
-           unlock_data($sem);
-           ignore_user_abort(FALSE);
-           return (page_sync($to_stat == "table" ? "table.php" : "index.php"));
-         }
          log_rd2($sess, "lost history, refresh from scratch");
          $new_step = -1;
          break;
@@ -205,10 +178,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
       if ($user->the_end == TRUE) {
        log_rd2($sess, "LOGOUT BYE BYE!!");
        log_auth($user->sess, "Explicit logout.");
-       $tmp_sess = $user->sess;
        $user->sess = "";
-       step_unproxy($tmp_sess);
-       
        $user->name = "";
        $user->the_end = FALSE;
        
@@ -273,8 +243,8 @@ for ($i = 0 ; time() < $endtime ; $i++) {
   $old_subst = $subst;
   $old_step =  $step;
   // log_rd($sess, "POST MAIN ".$step);;
-  usleep(200000);
-  if (($i % 10) == 0) {
+  usleep(600000);
+  if (($i % 5) == 0) {
     // log_rd2($sess, "TIME: ".time());
     echo '_';
     flush();