diff options
| author | emkael <emkael@tlen.pl> | 2018-11-08 00:36:51 +0100 |
|---|---|---|
| committer | emkael <emkael@tlen.pl> | 2018-11-08 00:36:51 +0100 |
| commit | cfba80260caf8b62515088b2f7bb763c1ace3c14 (patch) | |
| tree | 8dba3fecdd656ad2f1ecdd2f528f0794c21e94bc | |
| parent | 5824c3eef46925fc795ca0c283ef3581ec0499d8 (diff) | |
Improved detection of score rows and cells
Fixes #9
| -rw-r--r-- | tdd/tdd-bootstrap.php | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/tdd/tdd-bootstrap.php b/tdd/tdd-bootstrap.php index 59abdb6..de78192 100644 --- a/tdd/tdd-bootstrap.php +++ b/tdd/tdd-bootstrap.php @@ -31,27 +31,30 @@ class Protocol { $tr = @$header_tr->next_sibling(); while($tr) { $td = $tr->find('td/a', 0); - $table = trim($td->innertext); - $table = str_replace(' ', '', $table); - $table = (int)$table; - if($table && array_key_exists($table, $this->deals_by_tables)) { - $contract1 = trim(str_replace(' ', '', $tr->find('td[class="bdc"]', 0)->innertext)); - $score1 = trim(str_replace(' ', '', end($tr->find('td'))->innertext)); - $contract2 = trim(str_replace(' ', '', $tr->next_sibling()->find('td[class="bdc"]', 0)->innertext)); - $score2 = trim(str_replace(' ', '', end($tr->next_sibling()->find('td'))->innertext)); + if ($td) { + $table = trim($td->innertext); + $table = str_replace(' ', '', $table); + $table = (int)$table; + if($table && array_key_exists($table, $this->deals_by_tables)) { + $nextTr = $tr->next_sibling(); + $contract1 = trim(str_replace(' ', '', $tr->find('td[class="bdc"]', 0)->innertext)); + $score1 = trim(str_replace(' ', '', $tr->find('td', 6)->innertext)); + $contract2 = trim(str_replace(' ', '', $tr->next_sibling()->find('td[class="bdc"]', 0)->innertext)); + $score2 = trim(str_replace(' ', '', $nextTr->find('td', 5)->innertext)); - $deal = $this->deals_by_tables[$table]; - $insert = "<a href=\"#table-$table\"><h4 id=\"table-$table\">Stół $table – Rozdanie {$deal->deal_num}</h4></a>"; - // if is played on both tables of a match - // note that the contract field for arbitral scores starts with 'A' (e.g. 'ARB' or 'AAA') - if(($score1 !== '' || strpos($contract1, 'A') === 0) - && ($score2 !== '' || strpos($contract2, 'A') === 0)) { - $insert .= $deal->html(); - } else { - $insert .= '<p>...</p>'; - } + $deal = $this->deals_by_tables[$table]; + $insert = "<a href=\"#table-$table\"><h4 id=\"table-$table\">Stół $table – Rozdanie {$deal->deal_num}</h4></a>"; + // if is played on both tables of a match + // note that the contract field for arbitral scores starts with 'A' (e.g. 'ARB' or 'AAA') + if(($score1 !== '' || strpos($contract1, 'A') === 0) + && ($score2 !== '' || strpos($contract2, 'A') === 0)) { + $insert .= $deal->html(); + } else { + $insert .= '<p>...</p>'; + } - $tr->outertext = '<tr class="tdd-header"><td colspan="7">' . $insert . '</td></tr>' . $tr->outertext; + $tr->outertext = '<tr class="tdd-header"><td colspan="' . (count($tr->find('td'))-1) . '">' . $insert . '</td></tr>' . $tr->outertext; + } } $tr = @$tr->next_sibling(); } |