X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=c35a0518694789ad9c37452599226fd65977033a;hp=d4a0d73183a2388c5f8930e922680cc3e80fedaf;hb=a14f75fff599d1a5e16b2f3e73fb673a67434928;hpb=243c535dd2efc9d8126aa6c153292d8253239dd9

diff --git a/remoteglot.pl b/remoteglot.pl
index d4a0d73..c35a051 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -289,13 +289,19 @@ sub handle_pgn {
 			my $pos = Position->start_pos($pgn->white, $pgn->black);
 			my $moves = $pgn->moves;
 			my @uci_moves = ();
+			my @repretty_moves = ();
 			for my $move (@$moves) {
-				my $uci_move;
-				($pos, $uci_move) = $pos->make_pretty_move($move);
+				my ($npos, $uci_move) = $pos->make_pretty_move($move);
 				push @uci_moves, $uci_move;
+
+				# Re-prettyprint the move.
+				my ($from_col, $from_row, $to_col, $to_row, $promo) = parse_uci_move($uci_move);
+				my ($pretty, undef) = $pos->{'board'}->prettyprint_move($from_row, $from_col, $to_row, $to_col, $promo);
+				push @repretty_moves, $pretty;
+				$pos = $npos;
 			}
 			$pos->{'result'} = $pgn->result;
-			$pos->{'pretty_history'} = $moves;
+			$pos->{'pretty_history'} = \@repretty_moves;
 
 			extract_clock($pgn, $pos);
 
@@ -892,12 +898,16 @@ sub output_json {
 		    ($new_depth == $old_depth && $new_nodes >= $old_nodes)) {
 			atomic_set_contents($filename, $encoded);
 			if (defined($json->{'plot_score'})) {
-				local $dbh->{AutoCommit} = 0;
-				$dbh->do('DELETE FROM scores WHERE id=?', undef, $id);
-				$dbh->do('INSERT INTO scores (id, plot_score, short_score, engine, depth, nodes) VALUES (?,?,?,?,?,?)', undef,
+				$dbh->do('INSERT INTO scores (id, plot_score, short_score, engine, depth, nodes) VALUES (?,?,?,?,?,?) ' .
+				         '    ON CONFLICT (id) DO UPDATE SET ' .
+				         '        plot_score=EXCLUDED.plot_score, ' .
+					 '        short_score=EXCLUDED.short_score, ' .
+					 '        engine=EXCLUDED.engine, ' .
+					 '        depth=EXCLUDED.depth, ' .
+					 '        nodes=EXCLUDED.nodes',
+					undef,
 					$id, $json->{'plot_score'}, $json->{'short_score'},
 					$json->{'engine'}{'name'}, $new_depth, $new_nodes);
-				$dbh->commit;
 			}
 		}
 	}