More deprettification. Not pretty_move and pretty_history, just move and history.

diff --git a/remoteglot.pl b/remoteglot.pl
index b1e37aacb43d8398caa7ccb27e9120e66770076c..e021c664894e4fb0a077f82ec81d79abff6fc61b 100755 (executable)
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -220,7 +220,7 @@ sub handle_fics {
                for my $pos ($pos_waiting, $pos_calculating) {
                        next if (!defined($pos));
                        if ($pos->fen() eq $pos_for_movelist->fen()) {
                for my $pos ($pos_waiting, $pos_calculating) {
                        next if (!defined($pos));
                        if ($pos->fen() eq $pos_for_movelist->fen()) {

-                               $pos->{'pretty_history'} = \@pretty_movelist;
+                               $pos->{'history'} = \@pretty_movelist;

                        }
                }
                $getting_movelist = 0;
                        }
                }
                $getting_movelist = 0;


@@ -312,7 +312,7 @@ sub handle_pgn {
                        if ($pgn->result eq '1-0' || $pgn->result eq '1/2-1/2' || $pgn->result eq '0-1') {
                                $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;
+                       $pos->{'history'} = \@repretty_moves;

 
                        extract_clock($pgn, $pos);
 
 
                        extract_clock($pgn, $pos);
 


@@ -863,7 +863,7 @@ sub output_json {
                                $refutation_lines{$pretty_move} = {
                                        depth => $info->{'depth' . $mpv},
                                        score => score_digest($info, $pos_calculating, $mpv),
                                $refutation_lines{$pretty_move} = {
                                        depth => $info->{'depth' . $mpv},
                                        score => score_digest($info, $pos_calculating, $mpv),

-                                       pretty_move => $pretty_move,
+                                       move => $pretty_move,

                                        pv => \@pretty_pv,
                                };
                        };
                                        pv => \@pretty_pv,
                                };
                        };


@@ -872,13 +872,13 @@ sub output_json {
        $json->{'refutation_lines'} = \%refutation_lines;
 
        # Piece together historic score information, to the degree we have it.
        $json->{'refutation_lines'} = \%refutation_lines;
 
        # Piece together historic score information, to the degree we have it.

-       if (!$historic_json_only && exists($pos_calculating->{'pretty_history'})) {
+       if (!$historic_json_only && exists($pos_calculating->{'history'})) {

                my %score_history = ();
 
                my $q = $dbh->prepare('SELECT * FROM scores WHERE id=?');
                my $pos = Position->start_pos('white', 'black');
                my $halfmove_num = 0;
                my %score_history = ();
 
                my $q = $dbh->prepare('SELECT * FROM scores WHERE id=?');
                my $pos = Position->start_pos('white', 'black');
                my $halfmove_num = 0;

-               for my $move (@{$pos_calculating->{'pretty_history'}}) {
+               for my $move (@{$pos_calculating->{'history'}}) {

                        my $id = id_for_pos($pos, $halfmove_num);
                        my $ref = $dbh->selectrow_hashref($q, undef, $id);
                        if (defined($ref)) {
                        my $id = id_for_pos($pos, $halfmove_num);
                        my $ref = $dbh->selectrow_hashref($q, undef, $id);
                        if (defined($ref)) {


@@ -962,7 +962,7 @@ sub output_json {
                $last_written_json = $encoded;
        }
 
                $last_written_json = $encoded;
        }
 

-       if (exists($pos_calculating->{'pretty_history'}) &&
+       if (exists($pos_calculating->{'history'}) &&

            defined($remoteglotconf::json_history_dir)) {
                my $id = id_for_pos($pos_calculating);
                my $filename = $remoteglotconf::json_history_dir . "/" . $id . ".json";
            defined($remoteglotconf::json_history_dir)) {
                my $id = id_for_pos($pos_calculating);
                my $filename = $remoteglotconf::json_history_dir . "/" . $id . ".json";


@@ -1008,7 +1008,7 @@ sub atomic_set_contents {
 sub id_for_pos {
        my ($pos, $halfmove_num) = @_;
 
 sub id_for_pos {
        my ($pos, $halfmove_num) = @_;
 

-       $halfmove_num //= scalar @{$pos->{'pretty_history'}};
+       $halfmove_num //= scalar @{$pos->{'history'}};

        (my $fen = $pos->fen()) =~ tr,/ ,-_,;
        return "move$halfmove_num-$fen";
 }
        (my $fen = $pos->fen()) =~ tr,/ ,-_,;
        return "move$halfmove_num-$fen";
 }


@@ -1265,7 +1265,7 @@ sub find_clock_start {
 
        # TODO(sesse): Maybe we can get the number of moves somehow else for FICS games.
        # The history is needed for id_for_pos.
 
        # TODO(sesse): Maybe we can get the number of moves somehow else for FICS games.
        # The history is needed for id_for_pos.

-       if (!exists($pos->{'pretty_history'})) {
+       if (!exists($pos->{'history'})) {

                return;
        }
 
                return;
        }
 

diff --git a/server/hash-lookup.js b/server/hash-lookup.js
index 139d228211845b29187f4c080294c12d6e859a8b..8c49e084501aaad35ddeb8e8ec9d79dd7d3b24f6 100644 (file)
--- a/server/hash-lookup.js
+++ b/server/hash-lookup.js
@@ -133,14 +133,13 @@ var translate_line = function(board, fen, line) {
        if (line['move'] && line['move']['from_sq']) {
                var promo = line['move']['promotion'];
                if (promo) {
        if (line['move'] && line['move']['from_sq']) {
                var promo = line['move']['promotion'];
                if (promo) {

-                       r['pretty_move'] = board.move({ from: line['move']['from_sq'], to: line['move']['to_sq'], promotion: promo.toLowerCase() }).san;
+                       r['move'] = board.move({ from: line['move']['from_sq'], to: line['move']['to_sq'], promotion: promo.toLowerCase() }).san;

                } else {
                } else {

-                       r['pretty_move'] = board.move({ from: line['move']['from_sq'], to: line['move']['to_sq'] }).san;
+                       r['move'] = board.move({ from: line['move']['from_sq'], to: line['move']['to_sq'] }).san;

                }
        } else {
                }
        } else {

-               r['pretty_move'] = '';
+               r['move'] = '';

        }
        }

-       r['sort_key'] = r['pretty_move'];

        if (!line['found']) {
                r['pv_pretty'] = [];
                return r;
        if (!line['found']) {
                r['pv_pretty'] = [];
                return r;


@@ -149,8 +148,8 @@ var translate_line = function(board, fen, line) {
 
        // Convert the PV.
        var pv = [];
 
        // Convert the PV.
        var pv = [];

-       if (r['pretty_move']) {
-               pv.push(r['pretty_move']);
+       if (r['move']) {
+               pv.push(r['move']);

        }
        for (var j = 0; j < line['pv'].length; ++j) {
                var move = line['pv'][j];
        }
        for (var j = 0; j < line['pv'].length; ++j) {
                var move = line['pv'][j];

diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js
index 114f3a4e7435aaf26f2700757dbd981f3ffa8084..c5ab4379f05d14074e314876fc84cc6116a72521 100644 (file)
--- a/www/js/remoteglot.js
+++ b/www/js/remoteglot.js
@@ -552,8 +552,8 @@ var create_arrow = function(from_square, to_square, fg_color, line_width, arrow_
 
 // Note: invert is ignored.
 var compare_by_name = function(refutation_lines, invert, a, b) {
 
 // Note: invert is ignored.
 var compare_by_name = function(refutation_lines, invert, a, b) {

-       var ska = refutation_lines[a]['pretty_move'];
-       var skb = refutation_lines[b]['pretty_move'];
+       var ska = refutation_lines[a]['move'];
+       var skb = refutation_lines[b]['move'];

        if (ska < skb) return -1;
        if (ska > skb) return 1;
        return 0;
        if (ska < skb) return -1;
        if (ska > skb) return 1;
        return 0;


@@ -797,7 +797,7 @@ var update_refutation_lines = function() {
 
                if (line['pv'].length == 0) {
                        // Not found, so just make a one-move PV.
 
                if (line['pv'].length == 0) {
                        // Not found, so just make a one-move PV.

-                       var move = "<a class=\"move\" href=\"javascript:show_line(" + display_lines.length + ", " + 0 + ");\">" + line['pretty_move'] + "</a>";
+                       var move = "<a class=\"move\" href=\"javascript:show_line(" + display_lines.length + ", " + 0 + ");\">" + line['move'] + "</a>";

                        $(move_td).html(move);
                        var score_td = document.createElement("td");
 
                        $(move_td).html(move);
                        var score_td = document.createElement("td");
 


@@ -813,13 +813,13 @@ var update_refutation_lines = function() {
                        var pv_td = document.createElement("td");
                        tr.appendChild(pv_td);
                        $(pv_td).addClass("pv");
                        var pv_td = document.createElement("td");
                        tr.appendChild(pv_td);
                        $(pv_td).addClass("pv");

-                       $(pv_td).html(add_pv(base_fen, base_line.concat([ line['pretty_move'] ]), move_num, toplay, scores, start_display_move_num));
+                       $(pv_td).html(add_pv(base_fen, base_line.concat([ line['move'] ]), move_num, toplay, scores, start_display_move_num));

 
                        tbl.append(tr);
                        continue;
                }
 
 
                        tbl.append(tr);
                        continue;
                }
 

-               var move = "<a class=\"move\" href=\"javascript:show_line(" + display_lines.length + ", " + 0 + ");\">" + line['pretty_move'] + "</a>";
+               var move = "<a class=\"move\" href=\"javascript:show_line(" + display_lines.length + ", " + 0 + ");\">" + line['move'] + "</a>";

                $(move_td).html(move);
 
                var score_td = document.createElement("td");
                $(move_td).html(move);
 
                var score_td = document.createElement("td");


@@ -959,8 +959,8 @@ var update_board = function() {
        // Print the history. This is pretty much the only thing that's
        // unconditionally taken from current_data (we're not interested in
        // historic history).
        // Print the history. This is pretty much the only thing that's
        // unconditionally taken from current_data (we're not interested in
        // historic history).

-       if (current_data['position']['pretty_history']) {
-               add_pv('start', current_data['position']['pretty_history'], 1, 'W', null, 0, 8, true);
+       if (current_data['position']['history']) {
+               add_pv('start', current_data['position']['history'], 1, 'W', null, 0, 8, true);

        } else {
                display_lines.push(null);
        }
        } else {
                display_lines.push(null);
        }


@@ -1465,14 +1465,14 @@ var format_halfmove_with_number = function(move, halfmove_num) {
  */
 var format_tooltip = function(data, halfmove_num) {
        if (data['score_history'][halfmove_num] ||
  */
 var format_tooltip = function(data, halfmove_num) {
        if (data['score_history'][halfmove_num] ||

-           halfmove_num === data['position']['pretty_history'].length) {
+           halfmove_num === data['position']['history'].length) {

                var move;
                var short_score;
                var move;
                var short_score;

-               if (halfmove_num === data['position']['pretty_history'].length) {
+               if (halfmove_num === data['position']['history'].length) {

                        move = data['position']['last_move'];
                        short_score = format_short_score(data['score']);
                } else {
                        move = data['position']['last_move'];
                        short_score = format_short_score(data['score']);
                } else {

-                       move = data['position']['pretty_history'][halfmove_num];
+                       move = data['position']['history'][halfmove_num];

                        short_score = format_short_score(data['score_history'][halfmove_num]);
                }
                var move_with_number = format_halfmove_with_number(move, halfmove_num);
                        short_score = format_short_score(data['score_history'][halfmove_num]);
                }
                var move_with_number = format_halfmove_with_number(move, halfmove_num);


@@ -1481,7 +1481,7 @@ var format_tooltip = function(data, halfmove_num) {
        } else {
                for (var i = halfmove_num; i --> 0; ) {
                        if (data['score_history'][i]) {
        } else {
                for (var i = halfmove_num; i --> 0; ) {
                        if (data['score_history'][i]) {

-                               var move = data['position']['pretty_history'][i];
+                               var move = data['position']['history'][i];

                                return "[Analysis kept from " + format_halfmove_with_number(move, i) + "]";
                        }
                }
                                return "[Analysis kept from " + format_halfmove_with_number(move, i) + "]";
                        }
                }