X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2Findex_rd.php;h=0dab464bff35dc3292ab349599457b6177b9f1d1;hb=3e45565444a79dcd582110c27f9066514d8a346f;hp=22903a27d19342abfc452701148e7d95203889ee;hpb=4a8c25612482bb427a327e0f69fc3603a37d709a;p=brisk.git

diff --git a/web/briskin5/index_rd.php b/web/briskin5/index_rd.php
index 22903a2..0dab464 100644
--- a/web/briskin5/index_rd.php
+++ b/web/briskin5/index_rd.php
@@ -57,13 +57,13 @@ function shutta()
 
 register_shutdown_function(shutta);
 
-function unrecerror()
+function blocking_error($is_unrecoverable)
 {
   GLOBAL $is_page_streaming;
 
   $is_page_streaming = TRUE;
-  log_rd2("UNREC_ERROR");
-  return (sprintf('the_end=true; window.onbeforeunload = null; window.onunload = null; document.location.assign("../index.php");'));
+  log_rd2("BLOCKING_ERROR UNREC: ".($is_unrecoverable ? "TRUE" : "FALSE"));
+  return (sprintf(($is_unrecoverable ? 'the_end=true; ' : '').'window.onbeforeunload = null; window.onunload = null; document.location.assign("../index.php");'));
 }
 
 function page_sync($sess, $page)
@@ -83,16 +83,18 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
     $bri = FALSE;
     $user = FALSE;
     $curtime = time();
-    
-    if (($proxy_step = Bin5_user::load_step($sess)) == FALSE) {
+
+    if (($proxy_step = Bin5_user::load_step($table_idx, $sess)) == FALSE) {
         log_only2("R");
-        return (FALSE);
+        ignore_user_abort(FALSE);
+        return (blocking_error(TRUE));
     }
     
     // log_rd2("M");
     /* Sync check (read only without modifications */
     ignore_user_abort(TRUE);
     if  ($first_loop == TRUE) {
+
         if (($sem = Bin5::lock_data($table_idx)) != FALSE) { 
             // Aggiorna l'expire time lato server
             $S_load_stat['U_first_loop']++;
@@ -100,20 +102,20 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
             if (($user = Bin5_user::load_data($table_idx, $proxy_step['i'], $sess)) == FALSE) {
                 Bin5::unlock_data($sem);
                 ignore_user_abort(FALSE);
-                return (unrecerror());
+                return (blocking_error(TRUE));
             }
             $user->lacc = $curtime;
 
             Bin5_user::save_data($user, $table_idx, $user->idx);
             
-            if (Bin5::garbage_time_is_expired($curtime)) {
+            if (Bin5::garbage_time_is_expired($table_idx, $curtime)) {
                 log_only("F");
                 
                 $S_load_stat['R_garbage']++;
                 if (($bri = Bin5::load_data($table_idx, $table_token)) == FALSE) {
                     Bin5::unlock_data($sem);
                     ignore_user_abort(FALSE);
-                    return (unrecerror());
+                    return (blocking_error(TRUE));
                 }
                 
                 $bri->garbage_manager(FALSE);
@@ -160,7 +162,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
         
         ignore_user_abort(FALSE);
         if ($user == FALSE) 
-            return (unrecerror());
+            return (blocking_error(TRUE));
     }
     
     /* Nothing changed, return. */
@@ -175,7 +177,11 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
          */
         ignore_user_abort(TRUE);
         $sem = Bin5::lock_data($table_idx);
-        $bri = Bin5::load_data($table_idx, $table_token);
+        if (($bri = Bin5::load_data($table_idx, $table_token)) == FALSE) {
+            Bin5::unlock_data($sem);
+            ignore_user_abort(FALSE);
+            return (blocking_error(TRUE));
+        }
         $S_load_stat['R_minusone']++;
         
         /* unset the $user var to reload it from main structure */
@@ -183,7 +189,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
         if (($user = $bri->get_user($sess, $idx)) == FALSE) {
             Bin5::unlock_data($sem);
             ignore_user_abort(FALSE);
-            return (unrecerror());
+            return (blocking_error(TRUE));
         }
         if ($user->the_end) {
             log_rd2("main_check: the end".var_export(debug_backtrace()));
@@ -238,7 +244,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
         if (($user = Bin5_user::load_data($table_idx, $proxy_step['i'], $sess)) == FALSE) {
             Bin5::unlock_data($sem);
             ignore_user_abort(FALSE);
-            return (unrecerror());
+            return (blocking_error(TRUE));
         }
         if ($cur_step < $user->step) {
             do {
@@ -270,27 +276,32 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
                 log_auth($user->sess, "Explicit logout.");
                 
                 $S_load_stat['R_the_end']++;
-                $bri = Bin5::load_data($table_idx, $table_token);
+                if (($bri = Bin5::load_data($table_idx, $table_token)) == FALSE) {
+                    Bin5::unlock_data($sem);
+                    ignore_user_abort(FALSE);
+                    return (blocking_error(TRUE));
+                }
                 unset($user);
                 if (($user = $bri->get_user($sess, $idx)) == FALSE) {
                     Bin5::unlock_data($sem);
                     ignore_user_abort(FALSE);
-                    return (unrecerror());
+                    return (blocking_error(TRUE));
                 }
                 
                 $tmp_sess = $user->sess;
                 $user->sess = "";
-                step_unproxy($tmp_sess);
+                Bin5_user::unproxy_step($tmp_sess);
                 $user->name = "";
                 $user->the_end = FALSE;
                 
+                /* FIXME - and now ?? 
                 if ($user->subst == 'sitdown')
                     $bri->room_wakeup($user);
                 else if ($user->subst == 'standup')
                     $bri->room_outstandup($user);
                 else
                     log_rd2("LOGOUT FROM WHAT ???");
-                
+                */
                 Bin5::save_data($bri);
             }
         }
@@ -326,7 +337,7 @@ if (!isset($myfrom))
      $myfrom = "";
 if (!isset($subst))
      $subst = "";
-log_rd2("FROM OUTSIDE - STAT: ".$stat." SUBST: ".$subst." STEP: ".$step." MYFROM: ".$myfrom. "IS_PAGE:" . $is_page_streaming."USER_AGENT:".$HTTP_USER_AGENT);
+log_rd2("FROM OUTSIDE - STAT: ".$stat." SUBST: ".$subst." STEP: ".$step." MYFROM: ".$myfrom. "IS_PAGE:" . $is_page_streaming."USER_AGENT:".$HTTP_USER_AGENT."  TABLE:".$table_idx);
 
 
 $endtime = time() + STREAM_TIMEOUT;
@@ -339,7 +350,7 @@ for ($i = 0 ; time() < $endtime ; $i++) {
   $pre_main = gettimeofday(TRUE);
   if (($ret = maincheck($sess, $old_stat, $old_subst, $old_step, &$stat, &$subst, &$step, $table_idx, $table_token)) != FALSE) {
     echo '@BEGIN@';
-    // log_rd2(sprintf("\nSESS: [%s]\nOLD_STAT: [%s] OLD_SUBST: [%s] OLD_STEP: [%s] \nSTAT: [%s] SUBST: [%s] STEP: [%s] \nCOMM: [%s]\n", $sess, $old_stat, $old_subst, $old_step, $stat, $subst, $step, $ret));
+    log_rd2(sprintf("\nSESS: [%s]\nOLD_STAT: [%s] OLD_SUBST: [%s] OLD_STEP: [%s] \nSTAT: [%s] SUBST: [%s] STEP: [%s] \nCOMM: [%s]\n", $sess, $old_stat, $old_subst, $old_step, $stat, $subst, $step, $ret));
     echo "$ret";
     echo ' @END@'; 
     log_send("EXT_STEP: ".$ext_step." ENDTIME: [".$endtime."] ".$ret);