X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=39a0f4ba805f4312f6a12afe69be7757a6ed0384;hp=62d3aa1dbc84496be887850af91569bc82f9107e;hb=6bde401b27dd87a407f95b29fff99ed681ab8a4c;hpb=181097241ea4fe24cbea99a0a92736e39704e4a6

diff --git a/remoteglot.pl b/remoteglot.pl
index 62d3aa1..39a0f4b 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -209,7 +209,7 @@ sub handle_fics {
 		for my $pos ($pos_waiting, $pos_calculating) {
 			next if (!defined($pos));
 			if ($pos->fen() eq $pos_for_movelist->fen()) {
-				$pos->{'history'} = \@uci_movelist;
+				$pos->{'pretty_history'} = \@pretty_movelist;
 			}
 		}
 		$getting_movelist = 0;
@@ -278,7 +278,7 @@ sub handle_pgn {
 				($pos, $uci_move) = $pos->make_pretty_move($move);
 				push @uci_moves, $uci_move;
 			}
-			$pos->{'history'} = \@uci_moves;
+			$pos->{'pretty_history'} = $moves;
 
 			# Sometimes, PGNs lose a move or two for a short while,
 			# or people push out new ones non-atomically. 
@@ -709,8 +709,8 @@ sub output_json {
 	$json->{'seldepth'} = $info->{'seldepth'};
 	$json->{'tablebase'} = $info->{'tablebase'};
 
-	# single-PV only for now
-	$json->{'pv_uci'} = $info->{'pv'};
+	$json->{'pv_uci'} = $info->{'pv'};  # Still needs to be there for the JS to calculate arrows; only for the primary PV, though!
+	$json->{'pv_pretty'} = [ prettyprint_pv($pos_calculating, @{$info->{'pv'}}) ];
 
 	my %refutation_lines = ();
 	my @refutation_lines = ();
@@ -731,8 +731,8 @@ sub output_json {
 					score_sort_key => score_sort_key($info, $pos_calculating, $mpv, 0),
 					pretty_score => short_score($info, $pos_calculating, $mpv),
 					pretty_move => $pretty_move,
+					pv_pretty => \@pretty_pv,
 				};
-				$refutation_lines{$pv->[0]}->{'pv_uci'} = $pv;
 			};
 		}
 	}
@@ -741,9 +741,9 @@ sub output_json {
 	my $encoded = JSON::XS::encode_json($json);
 	atomic_set_contents($remoteglotconf::json_output, $encoded);
 
-	if (exists($pos_calculating->{'history'}) &&
+	if (exists($pos_calculating->{'pretty_history'}) &&
 	    defined($remoteglotconf::json_history_dir)) {
-		my $halfmove_num = scalar @{$pos_calculating->{'history'}};
+		my $halfmove_num = scalar @{$pos_calculating->{'pretty_history'}};
 		(my $fen = $pos_calculating->fen()) =~ tr,/ ,-_,;
 		my $filename = $remoteglotconf::json_history_dir . "/move$halfmove_num-$fen.json";