X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2Fstat-day.php;h=a9fcdee1fca69c689606c4d67357427fafe26db2;hb=649907a529ae4bee21990c05f196a144dab8624b;hp=d70d208ee211a4c5f62c5ec4374770eb46bbb586;hpb=8443d4399f04e0f45453490382bb0d6ccc927bec;p=brisk.git

diff --git a/web/briskin5/stat-day.php b/web/briskin5/stat-day.php
index d70d208..a9fcdee 100644
--- a/web/briskin5/stat-day.php
+++ b/web/briskin5/stat-day.php
@@ -40,8 +40,14 @@ curl -d "pazz=$BRISK_PASS" "http://$BRISK_SITE/briskin5/stat-day.php?from=$(date
 
 $G_base = "../";
 
-$mlang_stat_day = array( 'normal match'=> array( 'it' => 'Partite normali',
-                                                 'en' => 'Normal matches' ),
+// SYNC WITH bin5_tournaments table
+$mlang_stat_day = array(
+                         'old rules: with draw'=> array( 'it' => 'Partite vecchie (con il pareggio)',
+                                                         'en' => 'Old matches (with draw)' ),
+
+                         'new rules: without draw' => array( 'it' => 'Partite nuove (senza pareggio)',
+                                                             'en' => 'New matches (without draw)'),
+
                          'special match' => array( 'it' => 'Partite speciali',
                                                    'en' => 'Special matches'),
 
@@ -252,10 +258,10 @@ function main_pgsql($from, $to)
             break;
         }
 
-        if (pg_query($bdb->dbconn->db(), "BEGIN") == FALSE) {
-            log_crit("stat-day: begin failed");
-            break;
-        }
+        //if ($bdb->transaction("BEGIN") == FALSE) {
+        //    log_crit("stat-day: begin failed");
+        //    break;
+        //}
 
         // retrieve list of active tournaments
         $trn_sql = sprintf("SELECT * FROM %sbin5_tournaments WHERE active = 1;", $G_dbpfx);
@@ -427,8 +433,10 @@ SELECT p.pts AS pts
                                 ($tmt_obj->minus_one_is_old == -1 ? "td" : "th"));
                     }
                     if ($tmt_obj->minus_one_is_old != -1) {
+                        // FIXME
+                        $rules_name = "Rules_old_rules";
                         fprintf($fpexp, "<td>%s</td><td>%s</td>", $users[$gam_obj->mazzo]['login'],
-                                xcape( game_description($gam_obj->act, 'plain', $gam_obj->mult,
+                                xcape( ${rules_name}::game_description($gam_obj->act, 'plain', $gam_obj->mult,
                                                         $gam_obj->asta_win,
                                                         ($gam_obj->asta_win != -1 ?
                                                          $users[$gam_obj->asta_win]['login'] : ""),
@@ -471,15 +479,18 @@ SELECT sum(p.pts * (2^g.mult)) AS pts
             }
         }
         if ($t < $trn_n) {
-            log_crit("stat-day: t < trn_n");
+            log_crit(sprintf("stat-day: t < trn_n (%d, %d)", $t, $trn_n));
             break;
         }
+        // if ($bdb->transaction("COMMIT") == FALSE) {
+        //     break;
+        // }
         $ret = (TRUE);
     } while (0);
 
-    if ($ret == FALSE) {
-        pg_query($bdb->dbconn->db(), "ROLLBACK");
-    }
+    // if ($ret == FALSE) {
+    //    $bdb->transaction("ROLLBACK");
+    // }
     if ($fpexp != FALSE) {
         fclose($fpexp);
     }