X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_rd.php;h=b88ce9949d592e183c9e440013cc5359b021810f;hb=ae4baf0b0142cc538df4370430f4971440b33ee6;hp=f1af84dec71c81cb0abeb36fd6811e7513f8052c;hpb=bb4bd80920fcff2ce4fe07aef2faaa3f739b9d58;p=brisk.git

diff --git a/web/index_rd.php b/web/index_rd.php
index f1af84d..b88ce99 100644
--- a/web/index_rd.php
+++ b/web/index_rd.php
@@ -50,12 +50,12 @@ function unrecerror()
   return (sprintf('the_end=true; window.onunload = null; document.location.assign("index.php");'));
 }
 
-function page_sync($page)
+function page_sync($sess, $page)
 {
   GLOBAL $is_page_streaming;
 
   $is_page_streaming = TRUE;
-  // log_rd2("PAGE_SYNC");
+  log_rd2($sess, "PAGE_SYNC");
   return (sprintf('the_end=true; window.onunload = null; document.location.assign("%s");', $page));
 }
 
@@ -75,7 +75,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
   if (($sem = lock_data()) != FALSE) { 
     // Aggiorna l'expire time lato server
     if  ($first_loop == TRUE) {
-      log_rd2($sess, "F");
+      log_only($sess, "F");
       $bri = &load_data();
       if (($user = &$bri->get_user($sess, $idx)) == FALSE) {
 	unlock_data($sem);
@@ -90,6 +90,8 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
       save_data($bri);
       $first_loop = FALSE;
     }
+
+    log_only($sess, "U");
     unlock_data($sem);
     ignore_user_abort(FALSE);
   }
@@ -101,14 +103,30 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
     // log_rd2($sess, "Postget".$proxy_step."zizi");
 
     if ($cur_step == $proxy_step) {
-      log_rd2($sess, "P");
-      return;
+      log_only2($sess, "P");
+      return (FALSE);
+    }
+    else {
+      log_only2($sess, "R");
     }
   }
+  else {
+      log_only2($sess, "R");
+  }
 
-  if ($bri == FALSE)
-    $bri = &load_data();
-
+  if ($bri == FALSE) {
+    ignore_user_abort(TRUE);
+    if (($sem = lock_data()) != FALSE) { 
+      log_only($sess, "P");
+      $bri = &load_data();
+      unlock_data($sem);
+      ignore_user_abort(FALSE);
+    }
+    else {
+      return (FALSE);
+    }
+  }
+  
   if (($user = &$bri->get_user($sess, $idx)) == FALSE) {
     return (unrecerror());
   }
@@ -189,7 +207,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
 	    $to_stat = $user->stat;
 	    unlock_data($sem);
 	    ignore_user_abort(FALSE);
-	    return (page_sync($to_stat == "table" ? "table.php" : "index.php"));
+	    return (page_sync($user->sess, $to_stat == "table" ? "table.php" : "index.php"));
 	  }
 	  log_rd2($sess, "lost history, refresh from scratch");
 	  $new_step = -1;
@@ -279,8 +297,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(400000);
+  if (($i % 5) == 0) {
     // log_rd2($sess, "TIME: ".time());
     echo '_';
     flush();