node-sword-interface 0.248.0 → 0.251.0

package/package.json

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

package/src/node_sword_cli.cpp

@@ -214,13 +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("GerNeUe", "Glaube", 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);
+    /*get_book_headers(textProcessor);*/
 
     return 0;
 }

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/module_search.cpp

@@ -50,10 +50,17 @@
 using namespace std;
 using namespace sword;
 
-ListKey ModuleSearch::getScopeKey(SearchScope scope)
+ListKey ModuleSearch::getScopeKey(SWModule* module, SearchScope scope)
 {
     ListKey key;
 
+    if (module == 0) {
+      cerr << "ModuleSearch::getScopeKey / received 0 pointer for module!!!";
+      return key;
+    }
+
+    VerseKey verseKey = module->getKey();
+
     switch (scope) {
         case SearchScope::OT:
         {
@@ -63,7 +70,7 @@ ListKey ModuleSearch::getScopeKey(SearchScope scope)
                                   "Isaiah;Jeremiah;Lamentations;Ezekiel;Daniel;Hosea;Joel;Amos;Obadiah;"
                                   "Jonah;Micah;Nahum;Habakkuk;Zephaniah;Haggai;Zechariah;Malachi;";
 
-            key = VerseKey().parseVerseList(otBooks, "", true);
+            key = verseKey.parseVerseList(otBooks, "", true);
             break;
         }
         
@@ -74,7 +81,7 @@ ListKey ModuleSearch::getScopeKey(SearchScope scope)
                                   "I Timothy;II Timothy;Titus;Philemon;Hebrews;James;I Peter;II Peter;"
                                   "I John;II John;III John;Jude;Revelation of John;";
 
-            key = VerseKey().parseVerseList(ntBooks, "", true);
+            key = verseKey.parseVerseList(ntBooks, "", true);
             break;
         }
         
@@ -119,7 +126,7 @@ vector<Verse> ModuleSearch::getModuleSearchResults(string moduleName,
         ListKey scopeKey;
 
         if (searchScope != SearchScope::BIBLE) {
-            scopeKey = this->getScopeKey(searchScope);
+            scopeKey = this->getScopeKey(module, searchScope);
             scope = &scopeKey;
         }
 

package/src/sword_backend/module_search.hpp

@@ -65,7 +65,7 @@ public:
     void terminate();
 
 private:
-    sword::ListKey getScopeKey(SearchScope scope);
+    sword::ListKey getScopeKey(sword::SWModule* module, SearchScope scope);
 
     ModuleStore& _moduleStore;
     ModuleHelper& _moduleHelper;

package/src/sword_backend/text_processor.cpp

@@ -430,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());