node-sword-interface 0.246.0 → 0.250.0

package/package.json

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

package/src/sword_backend/module_helper.cpp

@@ -70,14 +70,25 @@ bool ModuleHelper::moduleHasKeyValuePair(sword::SWModule* module, std::string ke
 
 bool ModuleHelper::moduleHasBook(sword::SWModule* module, std::string bookCode)
 {
-    bool hasBook;
+    bool hasBook = true;
     stringstream key;
     key << bookCode;
     key << " 1:1";
 
     module->setKey(key.str().c_str());
-    hasBook = module->hasEntry(module->getKey());
-    
+    string moduleKeyText = string(module->getKey()->getShortText());
+
+    /* In case of apocryphal books the hasEntry method below is not enough.
+       Once we have set the key we need to compare the actual module key with the key we wanted to set.
+       For apocryphal books we may get "Rev 1:1" as actual module key and this will mismatch with the set key
+       and then indicate that the book is not existing. */
+
+    if (moduleKeyText != key.str()) {
+        hasBook = false;
+    } else {
+        hasBook = module->hasEntry(module->getKey());
+    }
+
     return hasBook;
 }
 

package/src/sword_backend/text_processor.cpp

@@ -43,7 +43,7 @@ TextProcessor::TextProcessor(ModuleStore& moduleStore, ModuleHelper& moduleHelpe
     this->_rawMarkupEnabled = false;
 }
 
-string TextProcessor::getFilteredText(const string& text, int chapter, bool hasStrongs, bool hasDuplicateClosingEndDivs)
+string TextProcessor::getFilteredText(const string& text, int chapter, int verseNr, bool hasStrongs, bool hasDuplicateClosingEndDivs)
 {
     //static regex schlachterMarkupFilter = regex("<H.*> ");
     static string chapterFilter = "<chapter";
@@ -70,6 +70,8 @@ string TextProcessor::getFilteredText(const string& text, int chapter, bool hasS
     static string quoteElementFilter = "<q ";
     static string titleStartElementFilter = "<title";
     static string titleEndElementFilter = "</title>";
+    static string segStartElementFilter = "<seg>";
+    static string segEndElementFilter = "</seg>";
     static string divTitleElementFilter = "<div class=\"title\"";
     static string secHeadClassFilter = "class=\"sechead\"";
     static string divMilestoneFilter = "<div type=\"x-milestone\"";
@@ -126,7 +128,8 @@ string TextProcessor::getFilteredText(const string& text, int chapter, bool hasS
 
     stringstream sectionTitleElement;
     sectionTitleElement << "<div class=\"sword-markup sword-section-title\" ";
-    sectionTitleElement << "chapter=\"" << chapter << "\"";
+    sectionTitleElement << "chapter=\"" << chapter << "\" ";
+    sectionTitleElement << "verse=\"" << verseNr << "\"";
     this->findAndReplaceAll(filteredText, titleStartElementFilter, sectionTitleElement.str());
     this->findAndReplaceAll(filteredText, divTitleElementFilter, sectionTitleElement.str());
 
@@ -136,6 +139,8 @@ string TextProcessor::getFilteredText(const string& text, int chapter, bool hasS
     this->findAndReplaceAll(filteredText, secHeadClassFilter, secHead.str());
 
     this->findAndReplaceAll(filteredText, titleEndElementFilter, "</div>");
+    this->findAndReplaceAll(filteredText, segStartElementFilter, "");
+    this->findAndReplaceAll(filteredText, segEndElementFilter, "");
     this->findAndReplaceAll(filteredText, divMilestoneFilter, "<div class=\"sword-markup sword-x-milestone\"");
     this->findAndReplaceAll(filteredText, milestoneFilter, "<div class=\"sword-markup sword-milestone\"");
     this->findAndReplaceAll(filteredText, xBrFilter, "x-br\"/> ");
@@ -181,7 +186,7 @@ string TextProcessor::getCurrentChapterHeading(sword::SWModule* module)
     string chapterHeading = "";
     VerseKey currentVerseKey = module->getKey();
     int currentChapter = currentVerseKey.getChapter();
-    int currentVerse = currentVerseKey.getVerse();
+    int currentVerseNr = currentVerseKey.getVerse();
 
     if (currentVerseKey.getVerse() == 1) { // X:1, set key to X:0
         // Include chapter/book/testament/module intros
@@ -201,10 +206,10 @@ string TextProcessor::getCurrentChapterHeading(sword::SWModule* module)
     if (this->_markupEnabled && !this->_rawMarkupEnabled) {
         // The chapter headings in the ISV are screwed up somehow for 1:1
         // Therefore we do not render chapter headings for the first verse of the book in this case.
-        if (currentChapter == 1 && currentVerse == 1 && currentModuleName == "ISV") {
+        if (currentChapter == 1 && currentVerseNr == 1 && currentModuleName == "ISV") {
             chapterHeading = "";
         } else {
-            chapterHeading = this->getFilteredText(chapterHeading, currentChapter);
+            chapterHeading = this->getFilteredText(chapterHeading, currentChapter, currentVerseNr);
         }
     }
 
@@ -219,12 +224,13 @@ string TextProcessor::getCurrentVerseText(sword::SWModule* module, bool hasStron
     if (this->_markupEnabled && !forceNoMarkup) {
         VerseKey currentVerseKey = module->getKey();
         int currentChapter = currentVerseKey.getChapter();
+        int currentVerseNr = currentVerseKey.getVerse();
         verseText = string(module->getRawEntry());
         StringHelper::trim(verseText);
         filteredText = verseText;
 
         if (!this->_rawMarkupEnabled) {
-            filteredText = this->getFilteredText(verseText, currentChapter, hasStrongs, hasDuplicateClosingEndDivs);
+            filteredText = this->getFilteredText(verseText, currentChapter, currentVerseNr, hasStrongs, hasDuplicateClosingEndDivs);
         }
     } else {
         verseText = string(module->stripText());
@@ -424,12 +430,13 @@ string TextProcessor::getBookIntroduction(string moduleName, string bookCode)
     if (module == 0) {
         cerr << "getLocalModule returned zero pointer for " << moduleName << endl;
     } else {
-        VerseKey verseKey(bookCode.c_str());
+        module->setKeyText(bookCode.c_str());
+        VerseKey *verseKey = (VerseKey *)module->getKey();
 
         // Include chapter/book/testament/module intros
-        verseKey.setIntros(true);
-        verseKey.setChapter(0);
-        verseKey.setVerse(0);
+        verseKey->setIntros(true);
+        verseKey->setChapter(0);
+        verseKey->setVerse(0);
         module->setKey(verseKey);
 
         bookIntroText = string(module->getRawEntry());

package/src/sword_backend/text_processor.hpp

@@ -60,7 +60,7 @@ private:
                                int verseCount=-1);
 
     std::string getCurrentChapterHeading(sword::SWModule* module);
-    std::string getFilteredText(const std::string& text, int chapter, bool hasStrongs=false, bool hasDuplicateClosingEndDivs=false);
+    std::string getFilteredText(const std::string& text, int chapter, int verseNr, bool hasStrongs=false, bool hasDuplicateClosingEndDivs=false);
     std::string replaceSpacesInStrongs(const std::string& text);
     unsigned int findAndReplaceAll(std::string & data, std::string toSearch, std::string replaceStr);