X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2Fstat-day.php;h=d96cb6c626dadada6e43d88911c631ea704fcac4;hb=302c97f7ac81dfcc6fc8d8d44359f4f432e4618a;hp=71e8fc8eaa24400f356ddcfabd6f559f5182b948;hpb=6f7adfc43f2ce4ad8dcf616a58a8edaf3d6c5c42;p=brisk.git
diff --git a/web/briskin5/stat-day.php b/web/briskin5/stat-day.php
index 71e8fc8..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,30 +302,42 @@ 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", + $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']); @@ -401,7 +422,7 @@ function main_pgsql($from, $to) fprintf($fpexp, "<%s class='%s'>%d%s>", ($tmt_obj->minus_one_is_old == -1 ? "td" : "th"), - $cla_nam, $pts, + $cla_nam, pow(2,$gam_obj->mult) * $pts, ($tmt_obj->minus_one_is_old == -1 ? "td" : "th")); } if ($tmt_obj->minus_one_is_old != -1) { @@ -422,8 +443,15 @@ function main_pgsql($from, $to) // LISTA DEI TOTALI fprintf($fpexp, "
---|