node-sword-interface 0.245.0 → 0.249.0

package/package.json

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

package/src/node_sword_cli.cpp

@@ -114,6 +114,14 @@ void get_book_list(ModuleHelper& module_helper)
     }
 }
 
+void get_book_headers(TextProcessor& text_processor)
+{
+    vector<Verse> headerList = text_processor.getBookHeaderList("NASB", "John");
+    for (int i = 0; i < headerList.size(); i++) {
+        cout << headerList[i].content << endl;
+    }
+}
+
 void test_unlock_key(ModuleInstaller& module_installer, ModuleStore& module_store, TextProcessor& text_processor)
 {
     module_installer.uninstallModule("NA28");
@@ -206,11 +214,13 @@ int main(int argc, char** argv)
     //string translation = sword_facade.getSwordTranslation(string("/usr/share/sword/locales.d"), string("de"), string("locales"));
     //cout << translation << endl;
 
-    vector<Verse> searchResults = moduleSearch.getModuleSearchResults("NASB", "faith", SearchType::multiWord, SearchScope::NT, true);
+    /*vector<Verse> searchResults = moduleSearch.getModuleSearchResults("NASB", "faith", SearchType::multiWord, SearchScope::NT, true);
     cout << "Got " << searchResults.size() << " results!" << endl;
     for (unsigned int i=0; i < searchResults.size(); i++) {
         cout << searchResults[i].reference << endl;
-    }
+    }*/
+
+    get_book_headers(textProcessor);
 
     return 0;
 }

package/src/sword_backend/text_processor.cpp

@@ -36,8 +36,6 @@
 using namespace std;
 using namespace sword;
 
-#define SEARCHTYPE_ENTRYATTR -3L
-
 TextProcessor::TextProcessor(ModuleStore& moduleStore, ModuleHelper& moduleHelper)
     : _moduleStore(moduleStore), _moduleHelper(moduleHelper)
 {
@@ -45,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";
@@ -72,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\"";
@@ -128,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());
 
@@ -138,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\"/> ");
@@ -183,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
@@ -203,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);
         }
     }
 
@@ -221,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());
@@ -426,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());
@@ -475,7 +480,7 @@ vector<Verse> TextProcessor::getBookHeaderList(string moduleName, string bookCod
         ListKey scopeList = VerseKey().parseVerseList(bookCode.c_str(), "", true);
         SWKey* scope = &scopeList;
 
-        ListKey resultKey = module->search("/Heading", SEARCHTYPE_ENTRYATTR, 0, scope);
+        ListKey resultKey = module->search("/Heading", SWModule::SEARCHTYPE_ENTRYATTR, 0, scope);
 
         static string titleStartElementFilter = "<title";
         static string titleEndElementFilter = "</title>";
@@ -484,6 +489,8 @@ vector<Verse> TextProcessor::getBookHeaderList(string moduleName, string bookCod
 
         for (resultKey = TOP; !resultKey.popError(); resultKey++) {
             module->setKey(resultKey);
+            module->renderText();
+
             VerseKey currentKey(resultKey.getShortText());
 
             // get both Preverse and Interverse Headings and just merge them into the same map

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);