From db649f5f84ad2ff2f413addfae03ad4050768f44 Mon Sep 17 00:00:00 2001
From: Leonard Smith <lenrsmith@gmail.com>
Date: Thu, 6 May 2021 07:43:14 -0500
Subject: [PATCH] Change strip usfm method to look in <ULB> tag instead of <w>

---
 app/Handlers/UlbXmlImportHandler.php   |  4 ++--
 tests/Unit/UlbXmlImportHandlerTest.php | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Handlers/UlbXmlImportHandler.php b/app/Handlers/UlbXmlImportHandler.php
index 9cd2a92..3d6d3fc 100644
--- a/app/Handlers/UlbXmlImportHandler.php
+++ b/app/Handlers/UlbXmlImportHandler.php
@@ -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)) {
diff --git a/tests/Unit/UlbXmlImportHandlerTest.php b/tests/Unit/UlbXmlImportHandlerTest.php
index ab7a9b8..d5738e0 100644
--- a/tests/Unit/UlbXmlImportHandlerTest.php
+++ b/tests/Unit/UlbXmlImportHandlerTest.php
@@ -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]);