X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2Fstat-day.php;h=ff991e2219d07b539a9a0cb12d90c0105871b85b;hb=c33375c2aaad1aefb69e269be1a95d3f737027d6;hp=04d2cbcf1211e124f951a07f2b118b0b151f7bd3;hpb=8e4b8df113c19f41ddab9e31f9fd4fc24db2d91f;p=brisk.git

diff --git a/web/briskin5/stat-day.php b/web/briskin5/stat-day.php
index 04d2cbc..ff991e2 100644
--- a/web/briskin5/stat-day.php
+++ b/web/briskin5/stat-day.php
@@ -29,12 +29,12 @@ wget -O daily.txt dodo.birds.van/brisk/briskin5/stat-day.php?pazz=yourpasswd&fro
 now="$(date +%s)"
 
 # from 100 days ago to 1 day after
-to="$(date +"%Y-%m-%d+%H:%M:%S" -d @$(echo "$now + 86400" | bc))"
-from="$(date +"%Y-%m-%d+%H:%M:%S" -d @$(echo "$now - 8640000" | bc))"
+to="$(date +"%Y-%m-%d+%H:%M:%S" -d @$(echo "$(date +%s) + 86400" | bc))"
+from="$(date +"%Y-%m-%d+%H:%M:%S" -d @$(echo "$(date +%s) - 8640000" | bc))"
 # to="$(date +"%Y-%m-%d+%H:%M:%S" -d @$(echo "$now + 7200 " | bc))"
 # from="$(date +"%Y-%m-%d+%H:%M:%S" -d @$(echo "$now - 9200 " | bc))"
 
-curl -d "pazz=$BRISK_PASS" "http://$BRISK_SITE/briskin5/stat-day.php?from=$from&to=$to"
+curl -d "pazz=$BRISK_PASS" "http://$BRISK_SITE/briskin5/stat-day.php?from=$(date +"%Y-%m-%d+%H:%M:%S" -d @$(echo "$(date +%s) - 8640000" | bc))&to=$(date +"%Y-%m-%d+%H:%M:%S" -d @$(echo "$(date +%s) + 86400" | bc))"
 
 */
 
@@ -43,7 +43,10 @@ $G_base = "../";
 $mlang_stat_day = array( 'normal match'=> array( 'it' => 'Partite normali',
                                                  'en' => 'Normal matches' ),
                          'special match' => array( 'it' => 'Partite speciali',
-                                                   'en' => 'Special matches')
+                                                   'en' => 'Special matches'),
+
+                         'info_total'=> array( 'it' => 'totali',
+                                               'en' => 'En totali')
                          );
 
 
@@ -261,12 +264,13 @@ function main_pgsql($from, $to)
         }
 
         $trn_n = pg_numrows($trn_pg);
+        printf("Number of tournaments: %d\n", $trn_n);
 
         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 g.tstamp >= '%s' AND g.tstamp < '%s' GROUP BY m.code;",
-                               $G_dbpfx, $G_dbpfx, $G_dbpfx, $from, $to);
+            $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;",
+                               $G_dbpfx, $G_dbpfx, $G_dbpfx, $trn_obj->code, $from, $to);
 
             // if deletable old matches exists then ...
             if (($tmt_pg = pg_query($bdb->dbconn->db(), $tmt_sql)) == FALSE) {
@@ -286,6 +290,7 @@ function main_pgsql($from, $to)
                 log_crit("stat-day: tournament name not found in array");
                 break;
             }
+            printf("[Tournament [%s]], number of matches: %d\n", $mlang_stat_day[$trn_obj->name][$G_lang], $tmt_n);
             fprintf($fpexp, "<h3>%s</h3>", $mlang_stat_day[$trn_obj->name][$G_lang]);
 
             for ($m = 0 ; $m < $tmt_n ; $m++) {
@@ -303,8 +308,8 @@ SELECT u.code AS code, u.login AS login, min(g.tstamp) AS first, max(g.tstamp) A
                     break;
                 }
 
-                $gam_sql = sprintf("SELECT g.* FROM %sbin5_games AS g, %sbin5_matches AS m WHERE g.mcode = m.code AND m.code = %d ORDER BY g.tstamp;",
-                                   $G_dbpfx, $G_dbpfx, $tmt_obj->code);
+                $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 ) {
                     break;
                 }
@@ -347,7 +352,7 @@ SELECT u.code AS code, u.login AS login, min(g.tstamp) AS first, max(g.tstamp) A
                         fprintf($fpexp, "<th>%d</th>", $pts_obj->pts);
                     }
                     fprintf($fpexp, "<td>%s</td><td>%s</td>", $usr_obj[$gam_obj->mazzo]->login,
-                            xcape( game_description($gam_obj->act, 'plain',
+                            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) )
@@ -367,7 +372,7 @@ SELECT SUM(p.pts) AS pts FROM %sbin5_matches AS m, %sbin5_games AS g, %sbin5_poi
                     $tot_obj = pg_fetch_object($tot_pg, 0);
                     fprintf($fpexp, "<th>%d</th>", $tot_obj->pts);
                 }
-                fprintf($fpexp, "</tr>\n");
+                fprintf($fpexp, "<th colspan='2'>%s</th></tr>\n", $mlang_stat_day['info_total'][$G_lang]);
                 fprintf($fpexp, "</table>\n");
             }
             if ($m < $tmt_n)