diff options
| -rw-r--r-- | sklady/tdd.js | 6 | ||||
| -rw-r--r-- | tdd-bootstrap.php | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/sklady/tdd.js b/sklady/tdd.js index bc75356..70a8424 100644 --- a/sklady/tdd.js +++ b/sklady/tdd.js @@ -39,10 +39,14 @@ var TDD = { ev.stopPropagation(); }, + lastRefererNumber: undefined, detectReferer: function() { var regex = document.referrer.match(/\d+t(\d+)-\d+\.htm/); if (regex) { - return regex[1]; + if (regex[1] != TDD.lastRefererNumber) { + TDD.lastRefererNumber = regex[1]; + return regex[1]; + } } return undefined; }, diff --git a/tdd-bootstrap.php b/tdd-bootstrap.php index 48b088f..bdd68b6 100644 --- a/tdd-bootstrap.php +++ b/tdd-bootstrap.php @@ -183,8 +183,13 @@ function load_deals_for_tables($prefix, $round, $board_in_teamy) { $file_table = $match[1]; $file_start_board = $match[2]; - // 1 in teamy -> 1 in pbn; 24 in teamy -> 1 in pbn; 25 in teamy -> 1 in pbn - $num_in_pbn = $board_in_teamy - $file_start_board + 1; + $first_num_in_pbn = array(); + preg_match('/\[Board "(\d+)"\]/', file_get_contents($filename), $first_num_in_pbn); + $first_num_in_pbn = $first_num_in_pbn ? intval($first_num_in_pbn[1]) : 1; + + // 1 in teamy -> 1 in pbn; 24 in teamy -> 24 in pbn; 25 in teamy -> 1 in pbn + // if PBN doesn't start with Board 1, it's been adjusted + $num_in_pbn = $board_in_teamy - $file_start_board + $first_num_in_pbn; try { $deal = new Deal($filename, $num_in_pbn); |