X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=inline;f=web%2Fbriskin5%2Fstat-day.php;h=d96cb6c626dadada6e43d88911c631ea704fcac4;hb=302c97f7ac81dfcc6fc8d8d44359f4f432e4618a;hp=be148cfd1e49f68b935eb78afb1f17bfa44b7e23;hpb=f9a43770d979532e374b6f724e6303eb16b9afa0;p=brisk.git
diff --git a/web/briskin5/stat-day.php b/web/briskin5/stat-day.php
index be148cf..d96cb6c 100644
--- a/web/briskin5/stat-day.php
+++ b/web/briskin5/stat-day.php
@@ -141,7 +141,7 @@ function main_file($curtime)
for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
// echo $p." i) ".$i."
";
$username = $ar[9+($i*2)];
- if (($item = $bdb->getitem_bylogin($username, &$id)) == FALSE) {
+ if (($item = $bdb->getitem_bylogin($username, $id)) == FALSE) {
echo "WARNING: the user [".$username."] NOT EXISTS!
";
continue;
}
@@ -238,6 +238,7 @@ function main_pgsql($from, $to)
$ret = FALSE;
$fpexp = FALSE;
+ // log_crit("stat-day: BEGIN");
do {
if (($fpexp = @fopen(LEGAL_PATH."/explain.log", 'w')) == FALSE) {
log_crit("stat-day: open explain failed");
@@ -266,10 +267,18 @@ function main_pgsql($from, $to)
$trn_n = pg_numrows($trn_pg);
printf("Number of tournaments: %d\n", $trn_n);
+ // loop on tournaments
for ($t = 0 ; $t < $trn_n ; $t++) {
+ // log_crit("stat-day: LOOP t");
$trn_obj = pg_fetch_object($trn_pg, $t);
- $tmt_sql = sprintf("SELECT m.code AS code, m.mazzo_next as minus_one_is_old FROM %sbin5_matches AS m, %sbin5_games AS g, %sbin5_tournaments as t WHERE t.code = m.tcode AND m.code = g.mcode AND t.code = %d AND g.tstamp >= '%s' AND g.tstamp < '%s' GROUP BY m.code, minus_one_is_old ORDER BY m.code, minus_one_is_old DESC;",
+ $tmt_sql = sprintf("
+SELECT m.code AS code, m.mazzo_next as minus_one_is_old
+ FROM %sbin5_matches AS m, %sbin5_games AS g, %sbin5_tournaments as t
+ WHERE t.code = m.tcode AND m.code = g.mcode
+ AND t.code = %d AND g.tstamp >= '%s' AND g.tstamp < '%s'
+ GROUP BY m.code, minus_one_is_old
+ ORDER BY m.code, minus_one_is_old DESC;",
$G_dbpfx, $G_dbpfx, $G_dbpfx, $trn_obj->code, $from, $to);
// if deletable old matches exists then ...
@@ -293,34 +302,48 @@ function main_pgsql($from, $to)
printf("[Tournament [%s]], number of matches: %d\n", $mlang_stat_day[$trn_obj->name][$G_lang], $tmt_n);
fprintf($fpexp, "
%s | ", $users[$u]['login']); // note: we are looping on users, order on them not needed - $pts_sql = sprintf("SELECT p.pts as pts from %sbin5_games as g, %sbin5_points as p WHERE g.code = p.gcode AND g.mcode = %d AND p.ucode = %d ORDER BY g.code", - $G_dbpfx, $G_dbpfx, $G_dbpfx, + $pts_sql = sprintf(" +SELECT p.pts AS pts + FROM %sbin5_games AS g, %sbin5_points AS p + WHERE g.code = p.gcode AND g.mcode = %d AND p.ucode = %d + ORDER BY g.tstamp", + $G_dbpfx, $G_dbpfx, $tmt_obj->code, $users[$u]['code']); // points of the match for each user if (($pts_pg[$u] = pg_query($bdb->dbconn->db(), $pts_sql)) == FALSE) { + log_crit("stat-day: pts_sql failed"); break; } if ($u == 0) { @@ -328,11 +351,13 @@ function main_pgsql($from, $to) } else { if ($num_games != pg_numrows($pts_pg[$u])) { + log_crit("stat-day: num_games != pg_numrows"); break; } } } if ($u != BIN5_PLAYERS_N) { + log_crit("stat-day: u != BIN5_PLAYERS_N"); break; } @@ -340,21 +365,75 @@ function main_pgsql($from, $to) fprintf($fpexp, "mazzo | descrizione |
---|---|---|
%s | %s | ", $users[$gam_obj->mazzo]['login'], xcape( game_description($gam_obj->act, 'plain', $gam_obj->mult, - $gam_obj->asta_win, $users[$gam_obj->asta_win]['login'], - $gam_obj->friend, $users[$gam_obj->friend]['login'], + $gam_obj->asta_win, + ($gam_obj->asta_win != -1 ? + $users[$gam_obj->asta_win]['login'] : ""), + $gam_obj->friend, + ($gam_obj->friend != -1 ? + $users[$gam_obj->friend]['login'] : ""), $gam_obj->pnt, $gam_obj->asta_pnt) ) ); } @@ -364,8 +443,15 @@ function main_pgsql($from, $to) // LISTA DEI TOTALI fprintf($fpexp, "|