node-sword-interface 1.0.5 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-sword-interface",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Javascript (N-API) interface to SWORD library",
   "keywords": [
     "C++",

package/scripts/get_sword_build_win32.ps1

@@ -29,11 +29,19 @@ function unzip {
 $AllProtocols = [System.Net.SecurityProtocolType]'Tls11,Tls12'
 [System.Net.ServicePointManager]::SecurityProtocol = $AllProtocols
 
+$headers = @{}
+
+if (Test-Path env:CI) {
+		$headers = @{
+				Authorization="Bearer ${$secrets.GITHUB_TOKEN}"
+		}
+}
+
 # --- Set the uri for the release
 $URI = "https://api.github.com/repos/ezra-bible-app/sword-build-win32/releases/tags/v1.8.900-2022-11-06"
 
 # --- Query the API to get the url of the zip
-$Response = Invoke-RestMethod -Method Get -Uri $URI
+$Response = Invoke-RestMethod -Method Get -Uri $URI -Headers $headers
 $ZipName = $Response.assets[0].name
 $ZipUrl = $Response.assets[0].browser_download_url
 
@@ -52,4 +60,4 @@ Remove-Item $OutputPath
 
 # --- Rename the extracted folder to a standard name
 $LibDirName = $ZipName.Replace(".zip", "")
-Rename-Item -Path $LibDirName -NewName sword-build-win32
+Rename-Item -Path $LibDirName -NewName sword-build-win32

package/src/sword_backend/module_search.cpp

@@ -131,6 +131,8 @@ vector<Verse> ModuleSearch::getModuleSearchResults(string moduleName,
         }
 
         bool hasStrongs = this->_moduleHelper.moduleHasGlobalOption(module, "Strongs");
+        bool moduleMarkupIsBroken = this->_moduleHelper.isBrokenMarkupModule(moduleName);
+        bool hasInconsistentClosingEndDivs = this->_moduleHelper.isInconsistentClosingEndDivModule(moduleName);
 
         if (searchType == SearchType::strongsNumber) {
             if (!hasStrongs) {
@@ -163,7 +165,11 @@ vector<Verse> ModuleSearch::getModuleSearchResults(string moduleName,
         while (!listKey.popError()) {
             module->setKey(listKey.getElement());
 
-            string verseText = this->_textProcessor.getCurrentVerseText(module, hasStrongs);
+            string verseText = this->_textProcessor.getCurrentVerseText(module,
+                                                                        hasStrongs,
+                                                                        hasInconsistentClosingEndDivs,
+                                                                        moduleMarkupIsBroken);
+
             string currentReference = module->getKey()->getShortText();
 
             if (std::find(searchResultReferences.begin(),