From: Matteo Nastasi (mop) <nastasi@alternativeoutput.it>
Date: Wed, 19 Mar 2008 08:40:09 +0000 (+0000)
Subject: fixed buggy optimization
X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=c14163f1c08c65ecc8f1c4ce9d7c7244a1526a51;p=brisk.git

fixed buggy optimization
---

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 9497600..84176bb 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -61,7 +61,7 @@ define(BRISK_SINGLE_SESS, "");
 $G_false = FALSE;
 
 $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "spawn-0.9.3";
+$G_brisk_version = "spawn-0.10.1";
 
 $root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: dimensionamento dinamico dell\'area dati e ottimizzazione della stessa, versione beta.',
                         'Se vuoi iscriverti alla <a target="_blank" href="http://www.milug.org/cgi-bin/mailman/listinfo/ml-briscola">Mailing List</a>, cliccala!' );
diff --git a/web/briskin5/index_rd.php b/web/briskin5/index_rd.php
index fddb5a2..234e7b4 100644
--- a/web/briskin5/index_rd.php
+++ b/web/briskin5/index_rd.php
@@ -177,6 +177,10 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
     }
     else {
       log_rd2("TRANS NON ATTIVATO");
+      while (array_pop($user->comm) != NULL);
+      // $user->step_inc(COMM_N + 1);
+
+      Briskin5::save_data($bri);
       Briskin5::unlock_data($sem);
       ignore_user_abort(FALSE);
     }
diff --git a/web/index_rd.php b/web/index_rd.php
index 51986e1..3f57f2d 100644
--- a/web/index_rd.php
+++ b/web/index_rd.php
@@ -174,9 +174,16 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
       ignore_user_abort(FALSE);
     }
     else {
-      log_rd2("TRANS NON ATTIVATO");
-      Room::unlock_data($sem);
-      ignore_user_abort(FALSE);
+       log_rd2("TRANS NON ATTIVATO, clean del comm array");
+       while (($el = array_pop($user->comm)) != NULL) {
+	 log_rd2("clean element [".$el."]");
+       }
+	//        $user->step_inc(COMM_N + 1);
+        Room::save_data($room);
+	//        $new_step = $user->step;
+
+       Room::unlock_data($sem);
+       ignore_user_abort(FALSE);
     }
   }
       
@@ -188,10 +195,6 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
       $ret .= show_room(&$room, $user->step, &$user);
 
       // TODO uncomment and test
-      // while (array_pop($user->comm) != NULL);
-      // $new_step = -1;
-      // $user->step_inc(COMM_N + 1);
-      // Room::save_data($room);
       /* NOTE the sets went common */
       $new_stat =  $user->stat;
       $new_subst = $user->subst;
diff --git a/web/index_wr.php b/web/index_wr.php
index c80396d..b3abbdb 100644
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -56,7 +56,7 @@ $argz = explode('|', $mesg);
 log_wr('POSTSPLIT: '.$argz[0]);
 
 if ($argz[0] == 'shutdown') {
-  log_auth($user_cur->sess, "Shutdown session.");
+  log_auth($user->sess, "Shutdown session.");
   $tmp_sess = $user->sess;
   $user->sess = "";
   step_unproxy($tmp_sess);