From: Matteo Nastasi (mop) <nastasi@alternativeoutput.it>
Date: Wed, 4 Sep 2013 05:58:21 +0000 (+0200)
Subject: partial commit of new saving points schema
X-Git-Tag: tournaments-descr-refact~12
X-Git-Url: http://mop.ddnsfree.com/gitweb/?p=brisk.git;a=commitdiff_plain;h=aeaaa402b56747b3eb6b1d51bc099982c4bf13fc

partial commit of new saving points schema
---

diff --git a/TODO.txt b/TODO.txt
index fd9ece4..a9a6090 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -3,6 +3,12 @@
 
   FEATURES |
  ----------+
+   - CONTINUE FEATURE
+     . save points every game
+     . modify points calculation to include order and mazzo
+
+     . add command to continue
+
    - WEBSOCKET TRANSPORT
      . refactoring $enc attribute management
      DONE . reintroduced $enc = 'plain' for websocket
diff --git a/web/Obj/dbase_file.phh b/web/Obj/dbase_file.phh
index 223b3a1..de0e3c2 100644
--- a/web/Obj/dbase_file.phh
+++ b/web/Obj/dbase_file.phh
@@ -178,7 +178,7 @@ class BriskDB {
         return ($ret);
     }
 
-    function bin5_points_save($date, $ttok, $tidx, $codes, $pts)
+    function bin5_points_save($date, $table, $tidx, $codes, $pts)
     {
         return TRUE;
     }
diff --git a/web/Obj/dbase_pgsql.phh b/web/Obj/dbase_pgsql.phh
index 20f4725..c8fd026 100644
--- a/web/Obj/dbase_pgsql.phh
+++ b/web/Obj/dbase_pgsql.phh
@@ -289,9 +289,10 @@ class BriskDB
 
     //   ttok   text UNIQUE,      
     //   tidx   
-    function bin5_points_save($date, $ttok, $tidx, $ucodes, $pts)
+    function bin5_points_save($date, $table, $tidx, $ucodes, $pts)
     {
         GLOBAL $G_dbpfx;
+        $sql_ttok = escsql($table->table_token);
 
         $is_trans = FALSE;
         $ret = FALSE;
@@ -309,16 +310,26 @@ class BriskDB
             /*
              * matches management
              */
-            $mtc_sql = sprintf("SELECT * FROM %sbin5_matches WHERE ttok = '%s';", $G_dbpfx, escsql($ttok));
+            $mtc_sql = sprintf("UPDATE %sbin5_matches SET (mazzo_next, mult_next) = (%d, %d) WHERE ttok = '%s' RETURNING *;",
+                               $G_dbpfx, $table->mazzo, $table->mult, $sql_ttok);
             if (($mtc_pg  = $this->query($mtc_sql)) == FALSE || pg_numrows($mtc_pg) != 1) {
                 // match not exists, insert it
-                $mtc_sql = sprintf("INSERT INTO %sbin5_matches (ttok, tidx) VALUES ('%s', %d) RETURNING *;",
-                                   $G_dbpfx, escsql($ttok), $tidx);
-                if ( ! (($mtc_pg  = $this->query($mtc_sql)) != FALSE &&
-                        pg_affected_rows($mtc_pg) == 1) ) {
+                $mtc_sql = sprintf("INSERT INTO %sbin5_matches (ttok, tidx, mazzo_next, mult_next) VALUES ('%s', %d, %d, %d) RETURNING *;",
+                                   $G_dbpfx, $sql_ttok, $tidx, $table->mazzo, $table->mult);
+                if (($mtc_pg  = $this->query($mtc_sql)) == FALSE || pg_affected_rows($mtc_pg) != 1) {
                     log_crit(sprintf("bin5_points_save: failed at insert match [%s]", $mtc_sql));
                     break;
                 }
+                for ($i = 0 ; $i < $n ; $i++) {
+                    $ord_sql = sprintf("INSERT INTO %sbin5_table_order (mcode, ucode, pos) VALUES (%d, %d, %d);",
+                                       $G_dbpfx, $G_dbpfx, $sql_ttok, $ucode[$i], $i);
+                    if (($ord_pg = $this->query($ord_sql)) == FALSE || pg_affected_rows($ord_pg) != 1 ) {
+                        log_crit(sprintf("bin5_points_save: failed at insert table order [%s]", $ord_sql));
+                        break;
+                    }
+                }
+                if ($i < $n)
+                    break;
             }
             $mtc_obj = pg_fetch_object($mtc_pg,0);
 
@@ -328,10 +339,9 @@ class BriskDB
             $gam_sql = sprintf("INSERT INTO %sbin5_games (mcode, tstamp) 
                                                VALUES (%d, to_timestamp(%d)) RETURNING *;",
                                $G_dbpfx, $mtc_obj->code, $date);
-            if ( ! (($gam_pg  = $this->query($gam_sql)) != FALSE &&
-                    pg_affected_rows($gam_pg) == 1) ) {
+            if (($gam_pg  = $this->query($gam_sql)) == FALSE || pg_affected_rows($gam_pg) != 1) {
                 log_crit(sprintf("bin5_points_save: failed at insert game [%s]", $gam_sql));
-                break;                        
+                break;
             }
         
             $gam_obj = pg_fetch_object($gam_pg,0);
@@ -344,13 +354,11 @@ class BriskDB
                 $pts_sql = sprintf("INSERT INTO %sbin5_points (gcode, ucode, pts) 
                                                VALUES (%d, %d, %d);",
                                    $G_dbpfx, $gam_obj->code, $ucodes[$i], $pts[$i]);
-                if ( ! (($pts_pg  = $this->query($pts_sql)) != FALSE &&
-                        pg_affected_rows($pts_pg) == 1) ) {
+                if (($pts_pg  = $this->query($pts_sql)) == FALSE || pg_affected_rows($pts_pg) != 1) {
                     log_crit(sprintf("bin5_points_save: failed at insert point [%s]", $pts_sql));
-                    break;                        
+                    break;
                 }
             }
-
             if ($i < $n)
                 break;
             
diff --git a/web/briskin5/index_wr.php b/web/briskin5/index_wr.php
index 98fd79b..cdf1b0d 100644
--- a/web/briskin5/index_wr.php
+++ b/web/briskin5/index_wr.php
@@ -509,11 +509,12 @@ function bin5_index_wr_main(&$bri, $remote_addr_full, $get, $post, $cookie)
                             $plist .= '|'.xcapelt($ucodes[$i]);
                         }
                         log_legal($curtime, $user->ip, $user, "STAT:BRISKIN5:FINISH_GAME", $plist);
+                        $table->game_next();
                         if ($user->table_orig < TABLES_AUTH_N) {
                             require_once("../Obj/dbase_".$G_dbasetype.".phh");
                             
                             if (($bdb = BriskDB::create()) != FALSE) {
-                                $bdb->bin5_points_save($curtime, $table->table_token, $user->table_orig, $ucodes, $pt_cur);
+                                $bdb->bin5_points_save($curtime, $table, $user->table_orig, $ucodes, $pt_cur);
                                 unset($bdb);
                             }
                             else {
@@ -522,7 +523,6 @@ function bin5_index_wr_main(&$bri, $remote_addr_full, $get, $post, $cookie)
                             log_points($curtime, $user, "STAT:BRISKIN5:FINISH_GAME", $plist);
                         }
                         
-                        $table->game_next();
                         $table->game_init(&$bri->user);
                         
                         for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {