Change strip usfm method to look in <ULB> tag instead of <w>
This commit is contained in:
parent
dec8b69c7e
commit
db649f5f84
|
@ -357,7 +357,7 @@ class UlbXmlImportHandler
|
|||
$sub = $wordElem->getAttribute('sub');
|
||||
|
||||
// Does our content require a substitution?
|
||||
$ulb = $this->replaceSub($this->stripUsfmMarkup($wordElem));
|
||||
$ulb = $this->replaceSub($this->stripUsfmMarkupFromUlb($wordElem));
|
||||
|
||||
$word = Word::create([
|
||||
'verse_code' => implode('-', [$verse_id, $ognt_sort]),
|
||||
|
@ -405,7 +405,7 @@ class UlbXmlImportHandler
|
|||
* @param DOMElement $element
|
||||
* @return DOMElement
|
||||
*/
|
||||
protected function stripUsfmMarkup(DOMElement $element) : DOMElement
|
||||
protected function stripUsfmMarkupFromUlb(DOMElement $element) : DOMElement
|
||||
{
|
||||
$usfmNodes = $element->getElementsByTagName('usfm');
|
||||
if (!empty($usfmNodes)) {
|
||||
|
|
|
@ -20,7 +20,7 @@ class UlbXmlImportHandlerTest extends TestCase
|
|||
<book>
|
||||
<chapter >
|
||||
<verse>
|
||||
<w>Some test with markup <usfm>\f the markup \f*</usfm></w>
|
||||
<ULB>Some test with markup <usfm>\f the markup \f*</usfm></ULB>
|
||||
</verse>
|
||||
</chapter>
|
||||
</book>
|
||||
|
@ -31,12 +31,12 @@ END;
|
|||
$doc = new \DOMDocument;
|
||||
$doc->loadXML($xml);
|
||||
|
||||
$element = $doc->getElementsByTagName('w');
|
||||
$element = $doc->getElementsByTagName('ULB');
|
||||
|
||||
$handler = new UlbXmlImportHandler;
|
||||
|
||||
$reflection_class = new \ReflectionClass(UlbXmlImportHandler::class);
|
||||
$method = $reflection_class->getMethod('stripUsfmMarkup');
|
||||
$method = $reflection_class->getMethod('stripUsfmMarkupFromUlb');
|
||||
$method->setAccessible(true);
|
||||
|
||||
$result = $method->invoke($handler, $element[0]);
|
||||
|
@ -52,7 +52,7 @@ END;
|
|||
<book>
|
||||
<chapter >
|
||||
<verse>
|
||||
<w>Some test without markup</w>
|
||||
<ULB>Some test without markup</ULB>
|
||||
</verse>
|
||||
</chapter>
|
||||
</book>
|
||||
|
@ -63,12 +63,12 @@ END;
|
|||
$doc = new \DOMDocument;
|
||||
$doc->loadXML($xml);
|
||||
|
||||
$element = $doc->getElementsByTagName('w');
|
||||
$element = $doc->getElementsByTagName('ULB');
|
||||
|
||||
$handler = new UlbXmlImportHandler;
|
||||
|
||||
$reflection_class = new \ReflectionClass(UlbXmlImportHandler::class);
|
||||
$method = $reflection_class->getMethod('stripUsfmMarkup');
|
||||
$method = $reflection_class->getMethod('stripUsfmMarkupFromUlb');
|
||||
$method->setAccessible(true);
|
||||
|
||||
$result = $method->invoke($handler, $element[0]);
|
||||
|
|
Loading…
Reference in New Issue