X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=inline;f=web%2Fbriskin5%2Fstat-day.php;h=0cd4aad43ddf872029d07acd85a679690effdffc;hb=e41441bc6b07d3598dea8cd60ee2357db15361b4;hp=ff991e2219d07b539a9a0cb12d90c0105871b85b;hpb=c33375c2aaad1aefb69e269be1a95d3f737027d6;p=brisk.git
diff --git a/web/briskin5/stat-day.php b/web/briskin5/stat-day.php
index ff991e2..0cd4aad 100644
--- a/web/briskin5/stat-day.php
+++ b/web/briskin5/stat-day.php
@@ -269,7 +269,7 @@ function main_pgsql($from, $to)
for ($t = 0 ; $t < $trn_n ; $t++) {
$trn_obj = pg_fetch_object($trn_pg, $t);
- $tmt_sql = sprintf("SELECT m.code AS code 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;",
+ $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 ...
@@ -297,36 +297,32 @@ function main_pgsql($from, $to)
fprintf($fpexp, "
");
$tmt_obj = pg_fetch_object($tmt_pg, $m);
- $usr_sql = sprintf("
-SELECT u.code AS code, u.login AS login, min(g.tstamp) AS first, max(g.tstamp) AS last, m.tidx AS tidx FROM %sbin5_matches AS m, %sbin5_games AS g, %sbin5_points AS p, %susers AS u, %sbin5_table_orders AS o WHERE m.code = g.mcode AND g.code = p.gcode AND u.code = p.ucode AND m.code = %d AND m.code = o.mcode AND u.code = o.ucode GROUP BY u.code, u.login, m.tidx, o.pos ORDER BY o.pos;", $G_dbpfx, $G_dbpfx, $G_dbpfx, $G_dbpfx, $G_dbpfx, $tmt_obj->code);
-
- if (($usr_pg = pg_query($bdb->dbconn->db(), $usr_sql)) == FALSE ) {
- break;
- }
- $usr_n = pg_numrows($usr_pg);
- if ($usr_n != BIN5_PLAYERS_N) {
+ if (($users = $bdb->users_get($tmt_obj->code, TRUE, ($tmt_obj->minus_one_is_old > -1))) == FALSE) {
+ log_crit("%s: users_get failed", __FUNCTION__);
break;
}
$gam_sql = sprintf("SELECT g.* FROM %sbin5_tournaments as t, %sbin5_matches AS m, %sbin5_games AS g WHERE t.code = m.tcode AND m.code = g.mcode AND m.code = %d ORDER BY g.tstamp;",
$G_dbpfx, $G_dbpfx, $G_dbpfx, $tmt_obj->code);
if (($gam_pg = pg_query($bdb->dbconn->db(), $gam_sql)) == FALSE ) {
+ log_crit("stat-day: gam_sql failed");
break;
}
- $usr_obj = array();
- for ($u = 0 ; $u < $usr_n ; $u++) {
- $usr_obj[$u] = pg_fetch_object($usr_pg, $u);
+ for ($u = 0 ; $u < count($users) ; $u++) {
if ($u == 0) {
- fprintf($fpexp, "
%s | ", $usr_obj[$u]->login); - $pts_sql = sprintf("SELECT p.pts as pts from %sbin5_matches as m, %sbin5_games as g, %sbin5_points as p, %susers as u WHERE m.code = g.mcode AND g.code = p.gcode AND u.code = p.ucode AND m.code = %d AND u.code = %d ORDER BY g.code", $G_dbpfx, $G_dbpfx, $G_dbpfx, $G_dbpfx, - $tmt_obj->code, $usr_obj[$u]->code); + 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, + $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) { + if (($pts_pg[$u] = pg_query($bdb->dbconn->db(), $pts_sql)) == FALSE) { + log_crit("stat-day: pts_sql failed"); break; } if ($u == 0) { @@ -334,29 +330,38 @@ SELECT u.code AS code, u.login AS login, min(g.tstamp) AS first, max(g.tstamp) A } 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; } - fprintf($fpexp, "mazzo | descrizione | mazzo | descrizione | \n"); + } // LISTA DELLE VARIE PARTITE for ($g = 0 ; $g < $num_games ; $g++) { $gam_obj = pg_fetch_object($gam_pg, $g); fprintf($fpexp, "
---|---|---|---|---|
%d | ", $pts_obj->pts); + fprintf($fpexp, "<%s>%d%s>", + ($tmt_obj->minus_one_is_old == -1 ? "td" : "th"), + $pts_obj->pts, + ($tmt_obj->minus_one_is_old == -1 ? "td" : "th")); + } + if ($tmt_obj->minus_one_is_old != -1) { + fprintf($fpexp, "%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->pnt, $gam_obj->asta_pnt) ) + ); } - fprintf($fpexp, "%s | %s | ", $usr_obj[$gam_obj->mazzo]->login, - xcape( game_description($gam_obj->act, 'plain', $gam_obj->mult, - $gam_obj->asta_win, $usr_obj[$gam_obj->asta_win]->login, - $gam_obj->friend, $usr_obj[$gam_obj->friend]->login, - $gam_obj->pnt, $gam_obj->asta_pnt) ) - ); fprintf($fpexp, "%d | ", $tot_obj->pts); } - fprintf($fpexp, "%s | \n", $mlang_stat_day['info_total'][$G_lang]); + if ($tmt_obj->minus_one_is_old != -1) { + fprintf($fpexp, "%s | \n", $mlang_stat_day['info_total'][$G_lang]); + } fprintf($fpexp, "