X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2FObj%2Fdbase_pgsql.phh;h=abe9e730337db7a2ef611e739fabc2d8d9c2e547;hb=ca4114fe5a3d9afe1d3b6861128fa96720f738f5;hp=bd4dfb3ce78305700efaa23dd478dc859ec596a2;hpb=ce816fe4c9d983c42b3e9c25e62606c6bcc56b67;p=brisk.git

diff --git a/web/Obj/dbase_pgsql.phh b/web/Obj/dbase_pgsql.phh
index bd4dfb3..abe9e73 100644
--- a/web/Obj/dbase_pgsql.phh
+++ b/web/Obj/dbase_pgsql.phh
@@ -291,7 +291,7 @@ class BriskDB
 
     //   ttok   text UNIQUE,
     //   tidx
-    function bin5_points_save($date, $table, $tidx, $ucodes, $pts)
+    function bin5_points_save($date, $table, $tidx, $action, $ucodes, $pts)
     {
         GLOBAL $G_dbpfx;
         $sql_ttok = escsql($table->table_token);
@@ -315,6 +315,7 @@ class BriskDB
             $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, mazzo_next, mult_next) VALUES ('%s', %d, %d, %d) RETURNING *;",
                                    $G_dbpfx, $sql_ttok, $tidx, $table->mazzo, $table->mult);
@@ -322,9 +323,11 @@ class BriskDB
                     log_crit(sprintf("bin5_points_save: failed at insert match [%s]", $mtc_sql));
                     break;
                 }
+                $mtc_obj = pg_fetch_object($mtc_pg, 0);
+
                 for ($i = 0 ; $i < $n ; $i++) {
                     $ord_sql = sprintf("INSERT INTO %sbin5_table_orders (mcode, ucode, pos) VALUES (%d, %d, %d);",
-                                       $G_dbpfx, $G_dbpfx, $sql_ttok, $ucode[$i], $i);
+                                       $G_dbpfx, $mtc_obj->code, $ucodes[$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;
@@ -333,17 +336,20 @@ class BriskDB
                 if ($i < $n)
                     break;
             }
-            $mtc_obj = pg_fetch_object($mtc_pg,0);
+            else {
+                $mtc_obj = pg_fetch_object($mtc_pg,0);
+            }
 
             /*
              * games management
              */
-            $gam_sql = sprintf("INSERT INTO %sbin5_games (mcode, tstamp, asta_pnt, pnt, asta_win, friend, mazzo, mult)
-                                               VALUES (%d, to_timestamp(%d), %d, %d, %d, %d, %d, %d) RETURNING *;",
-                               $G_dbpfx, $mtc_obj->code, $date,
-                               ($table->old_asta_win == -1 ? -1 : $ucodes[$table->old_asta_win]),
-                               ($table->old_friend == -1 ? -1 : $ucodes[$table->old_friend]),
-                               $table->old_asta_pnt, $table->old_mult, $table->old_pnt);
+            $gam_sql = sprintf("INSERT INTO %sbin5_games (mcode, tstamp, act, asta_pnt, pnt, asta_win, friend, mazzo, mult)
+                                               VALUES (%d, to_timestamp(%d), %d, %d, %d, %d, %d, %d, %d) RETURNING *;",
+                               $G_dbpfx, $mtc_obj->code, $date, $action,
+                               $table->old_asta_pnt, $table->old_pnt,
+                               $table->old_asta_win,
+                               $table->old_friend,
+                               $table->old_mazzo, $table->old_mult);
             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;
@@ -373,7 +379,8 @@ class BriskDB
 
             $is_trans = FALSE;
 
-            $ret =  TRUE;
+            $table->match_id = $mtc_obj->code;
+            $ret = TRUE;
         } while (0);
 
         if ($is_trans)