From bef452514e4c78f5f13ad096b6643cd6d7d081f5 Mon Sep 17 00:00:00 2001 From: "Matteo Nastasi (mop)" Date: Tue, 25 Feb 2014 18:38:29 +0100 Subject: [PATCH] split sql request on multiple lines to be more readable --- web/briskin5/stat-day.php | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/web/briskin5/stat-day.php b/web/briskin5/stat-day.php index 11289cc..a895d7c 100644 --- a/web/briskin5/stat-day.php +++ b/web/briskin5/stat-day.php @@ -267,11 +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 ... @@ -295,23 +302,29 @@ 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

", $mlang_stat_day[$trn_obj->name][$G_lang]); + // loop on matches for ($m = 0 ; $m < $tmt_n ; $m++) { // log_crit("stat-day: LOOP m"); fprintf($fpexp, "
"); $tmt_obj = pg_fetch_object($tmt_pg, $m); + // get users for the match m if (($users = $bdb->users_get($tmt_obj->code, TRUE, ($tmt_obj->minus_one_is_old > -1))) == FALSE) { log_crit(sprintf("stat_day: users_get failed %d", $tmt_obj->code)); 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;", + $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; } + // loop on users of the match m for ($u = 0 ; $u < count($users) ; $u++) { // log_crit("stat-day: LOOP u"); if ($u == 0) { @@ -320,7 +333,11 @@ function main_pgsql($from, $to) } 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", + $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']); -- 2.17.1