Show totals.

[remoteglot-book] / www / opening-stats.pl

diff --git a/www/opening-stats.pl b/www/opening-stats.pl
index 076a6a3636ae0498b0af861c121de4ed5f3941de..c283248395aab0cf62496b2b6b66c0e99f26b6ce 100755 (executable)
--- a/www/opening-stats.pl
+++ b/www/opening-stats.pl
@@ -6,6 +6,7 @@ use JSON::XS;
 use lib '..';
 use Position;
 use IPC::Open2;
+use Chess::PGN::Parse;
 
 our %openings = ();
 read_openings();
@@ -22,19 +23,40 @@ print $chld_in $hex, "\n";
 chomp (my $line = <$chld_out>);
 
 my ($white, $draw, $black, $opening_num, $white_avg_elo, $black_avg_elo, $num_elo, $timestamp, $pgn_file_number, $pgn_start_position, @moves) = split / /, $line;
+my @json_moves = ();
+push @json_moves, {
+       white => $white * 1,
+       draw => $draw * 1,
+       black => $black * 1,
+       white_avg_elo => $white_avg_elo * 1,
+       black_avg_elo => $black_avg_elo * 1,
+       num_elo => $num_elo * 1
+};
+
 my $opening = $openings{$opening_num} // 'A00: Start position';
 
-my $root_pgn;
+my $root_game;
 eval {
        die "Missing PGN position data." if (!defined($pgn_file_number) || !defined($pgn_start_position));
-       $root_pgn = read_root_pgn($pgn_file_number, $pgn_start_position);
+       my $pgntext = read_root_pgn($pgn_file_number, $pgn_start_position);
+       my $pgn = Chess::PGN::Parse->new(undef, $pgntext);
+       $pgn->read_game() or die;
+       $pgn->parse_game() or die;
+
+       my $tags = $pgn->tags;
+       $root_game = {};
+       $root_game->{'white'} = $pgn->white;
+       $root_game->{'white_elo'} = $tags->{'WhiteElo'};
+       $root_game->{'black'} = $pgn->black;
+       $root_game->{'black_elo'} = $tags->{'BlackElo'};
+       $root_game->{'event'} = $pgn->event;
+       $root_game->{'date'} = $pgn->date;
+       $root_game->{'result'} = $pgn->result;
+       $root_game->{'eco'} = $pgn->eco;
+       $root_game->{'moves'} = scalar @{$pgn->moves};
 };
-if ($@) {
-       $root_pgn = "Could not find root PGN. ($@)";
-}
 
 # Explore one move out.
-my @json_moves = ();
 for my $move (@moves) {
        my ($np, $uci_move) = $pos->make_pretty_move($move);
        my $hex = unpack('H*', $np->bitpacked_fen);
@@ -53,12 +75,7 @@ for my $move (@moves) {
 }
 
 print $cgi->header(-type=>'application/json');
-print JSON::XS::encode_json({ moves => \@json_moves, opening => $opening, root_pgn => $root_pgn });
-
-sub num {
-       my $x = shift;
-       return $x->{'white'} + $x->{'draw'} + $x->{'black'};
-}
+print JSON::XS::encode_json({ moves => \@json_moves, opening => $opening, root_game => $root_game });
 
 sub read_openings {
        open my $fh, "../openings.txt"