X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Fbriskin5%2Fstat-day.php;h=cadeb265e83aff7e7d57bd6181553b109e482dd8;hb=7332bf2e21e419c2f5af5f7e955367b59c9da135;hp=71e8fc8eaa24400f356ddcfabd6f559f5182b948;hpb=6f7adfc43f2ce4ad8dcf616a58a8edaf3d6c5c42;p=brisk.git diff --git a/web/briskin5/stat-day.php b/web/briskin5/stat-day.php index 71e8fc8..cadeb26 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'), @@ -238,6 +244,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 +273,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 +308,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,19 +428,22 @@ 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) { + // FIXME + $rules_name = "Rules_old_rules"; fprintf($fpexp, "%s | %s | ", $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'] : ""), $gam_obj->friend, ($gam_obj->friend != -1 ? $users[$gam_obj->friend]['login'] : ""), - $gam_obj->pnt, $gam_obj->asta_pnt) ) + $gam_obj->pnt, $gam_obj->asta_pnt, $gam_obj->tourn_pts) ) ); } fprintf($fpexp, "
---|---|---|