X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=e1f36528b802f1c9023e6e81531cd2999ceb8976;hp=1caf19b14bddb389e955749831cb0607dab668e2;hb=c94ef784672e9d51359abad6954fd52aef8ec15e;hpb=5a625112cf0e2c26da7b2cf9b7a2ba7062ce0338

diff --git a/remoteglot.pl b/remoteglot.pl
index 1caf19b..e1f3652 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -291,7 +291,11 @@ sub handle_pgn {
 			}
 
 			$pgn->parse_game({ save_comments => 'yes' });
-			my $pos = Position->start_pos($pgn->white, $pgn->black);
+			my $white = $pgn->white;
+			my $black = $pgn->black;
+			$white =~ s/,.*//;  # Remove first name.
+			$black =~ s/,.*//;  # Remove first name.
+			my $pos = Position->start_pos($white, $black);
 			my $moves = $pgn->moves;
 			my @uci_moves = ();
 			my @repretty_moves = ();
@@ -305,7 +309,9 @@ sub handle_pgn {
 				push @repretty_moves, $pretty;
 				$pos = $npos;
 			}
-			$pos->{'result'} = $pgn->result;
+			if ($pgn->result eq '1-0' || $pgn->result eq '1/2-1/2' || $pgn->result eq '0-1') {
+				$pos->{'result'} = $pgn->result;
+			}
 			$pos->{'pretty_history'} = \@repretty_moves;
 
 			extract_clock($pgn, $pos);
@@ -829,9 +835,7 @@ sub output_json {
 	if (defined($remoteglotconf::move_source_url)) {
 		$json->{'move_source_url'} = $remoteglotconf::move_source_url;
 	}
-	$json->{'score'} = long_score($info, $pos_calculating, '');
-	$json->{'short_score'} = short_score($info, $pos_calculating, '');
-	$json->{'plot_score'} = plot_score($info, $pos_calculating, '');
+	$json->{'score'} = score_digest($info, $pos_calculating, '');
 	$json->{'using_lomonosov'} = defined($remoteglotconf::tb_serial_key);
 
 	$json->{'nodes'} = $info->{'nodes'};
@@ -861,8 +865,7 @@ sub output_json {
 				$refutation_lines{$pv->[0]} = {
 					sort_key => $pretty_move,
 					depth => $info->{'depth' . $mpv},
-					score_sort_key => score_sort_key($info, $pos_calculating, $mpv, 0),
-					pretty_score => short_score($info, $pos_calculating, $mpv),
+					score => score_digest($info, $pos_calculating, $mpv),
 					pretty_move => $pretty_move,
 					pv_pretty => \@pretty_pv,
 				};
@@ -883,8 +886,8 @@ sub output_json {
 			my $ref = $dbh->selectrow_hashref($q, undef, $id);
 			if (defined($ref)) {
 				$score_history{$halfmove_num} = [
-					$ref->{'plot_score'},
-					$ref->{'short_score'}
+					$ref->{'score_type'},
+					$ref->{'score_value'}
 				];
 			}
 			++$halfmove_num;
@@ -915,6 +918,7 @@ sub output_json {
 	}
 
 	# Give out a list of other games going on. (Empty is fine.)
+	# TODO: Don't bother reading our own file, the data will be stale anyway.
 	if (!$historic_json_only) {
 		my @games = ();
 
@@ -929,11 +933,18 @@ sub output_json {
 				my $white = $other_game_json->{'position'}{'player_w'} // die 'Missing white';
 				my $black = $other_game_json->{'position'}{'player_b'} // die 'Missing black';
 
-				push @games, {
+				my $game = {
 					id => $ref->{'id'},
 					name => "$white–$black",
-					url => $ref->{'url'}
+					url => $ref->{'url'},
+					hashurl => $ref->{'hash_url'},
 				};
+				if (defined($other_game_json->{'position'}{'result'})) {
+					$game->{'result'} = $other_game_json->{'position'}{'result'};
+				} else {
+					$game->{'score'} = $other_game_json->{'score'};
+				}
+				push @games, $game;
 			};
 			if ($@) {
 				warn "Could not add external game " . $ref->{'json_path'} . ": $@";
@@ -971,16 +982,16 @@ sub output_json {
 		    $new_depth > $old_depth ||
 		    ($new_depth == $old_depth && $new_nodes >= $old_nodes)) {
 			atomic_set_contents($filename, $encoded);
-			if (defined($json->{'plot_score'})) {
-				$dbh->do('INSERT INTO scores (id, plot_score, short_score, engine, depth, nodes) VALUES (?,?,?,?,?,?) ' .
+			if (defined($json->{'score'})) {
+				$dbh->do('INSERT INTO scores (id, score_type, score_value, engine, depth, nodes) VALUES (?,?,?,?,?,?) ' .
 				         '    ON CONFLICT (id) DO UPDATE SET ' .
-				         '        plot_score=EXCLUDED.plot_score, ' .
-					 '        short_score=EXCLUDED.short_score, ' .
+				         '        score_type=EXCLUDED.score_type, ' .
+					 '        score_value=EXCLUDED.score_value, ' .
 					 '        engine=EXCLUDED.engine, ' .
 					 '        depth=EXCLUDED.depth, ' .
 					 '        nodes=EXCLUDED.nodes',
 					undef,
-					$id, $json->{'plot_score'}, $json->{'short_score'},
+					$id, $json->{'score'}[0], $json->{'score'}[1],
 					$json->{'engine'}{'name'}, $new_depth, $new_nodes);
 			}
 		}
@@ -1051,30 +1062,28 @@ sub short_score {
 	return undef;
 }
 
-sub score_sort_key {
-	my ($info, $pos, $mpv, $invert) = @_;
+# Sufficient for computing long_score, short_score, plot_score and
+# (with side-to-play information) score_sort_key.
+sub score_digest {
+	my ($info, $pos, $mpv) = @_;
 
 	if (defined($info->{'score_mate' . $mpv})) {
 		my $mate = $info->{'score_mate' . $mpv};
-		my $score;
-		if ($mate > 0) {
-			# Side to move mates
-			$score = 99999 - $mate;
-		} else {
-			# Side to move is getting mated (note the double negative for $mate)
-			$score = -99999 - $mate;
-		}
-		if ($invert) {
-			$score = -$score;
+		if ($pos->{'toplay'} eq 'B') {
+			$mate = -$mate;
 		}
-		return $score;
+		return ['m', $mate];
 	} else {
 		if (exists($info->{'score_cp' . $mpv})) {
 			my $score = $info->{'score_cp' . $mpv};
-			if ($invert) {
+			if ($pos->{'toplay'} eq 'B') {
 				$score = -$score;
 			}
-			return $score;
+			if ($score == 0 && $info->{'tablebase'}) {
+				return ['d', undef];
+			} else {
+				return ['cp', $score];
+			}
 		}
 	}