node-sword-interface 0.250.0 → 0.253.0

package/package.json

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

package/src/napi_module/node_sword_interface.cpp

@@ -142,9 +142,9 @@ NodeSwordInterface::NodeSwordInterface(const Napi::CallbackInfo& info) : Napi::O
     Napi::Env env = info.Env();
     Napi::HandleScope scope(env);
 
-    std::string customHomeDir = "";
     std::string localeDir = "";
-    FileSystemHelper fsHelper;
+    this->customHomeDir = "";
+
     bool homeDirError = false;
     bool localeDirError = false;
 
@@ -153,9 +153,9 @@ NodeSwordInterface::NodeSwordInterface(const Napi::CallbackInfo& info) : Napi::O
     this->_currentModuleSearchWorker = 0;
 
     if (info[0].IsString()) {
-        customHomeDir = string(info[0].As<Napi::String>());
+        this->customHomeDir = string(info[0].As<Napi::String>());
 
-        if (!this->dirExists(info, customHomeDir)) {
+        if (!this->dirExists(info, this->customHomeDir)) {
             homeDirError = true;
         }
     }
@@ -171,10 +171,10 @@ NodeSwordInterface::NodeSwordInterface(const Napi::CallbackInfo& info) : Napi::O
     }
 
     if (!homeDirError && !localeDirError) { // We only proceed if there has not been any issue with the homeDir or localeDir
-        this->_moduleStore = new ModuleStore(customHomeDir);
+        this->_moduleStore = new ModuleStore(this->customHomeDir);
         this->_moduleHelper = new ModuleHelper(*(this->_moduleStore));
-        this->_repoInterface = new RepositoryInterface(this->_swordStatusReporter, *(this->_moduleHelper), customHomeDir);
-        this->_moduleInstaller = new ModuleInstaller(*(this->_repoInterface), *(this->_moduleStore), customHomeDir);
+        this->_repoInterface = new RepositoryInterface(this->_swordStatusReporter, *(this->_moduleHelper), this->customHomeDir);
+        this->_moduleInstaller = new ModuleInstaller(*(this->_repoInterface), *(this->_moduleStore), this->customHomeDir);
         this->_napiSwordHelper = new NapiSwordHelper(*(this->_moduleHelper), *(this->_moduleStore));
         this->_textProcessor = new TextProcessor(*(this->_moduleStore), *(this->_moduleHelper));
         this->_moduleSearch = new ModuleSearch(*(this->_moduleStore), *(this->_moduleHelper), *(this->_textProcessor));
@@ -952,6 +952,10 @@ Napi::Value NodeSwordInterface::getSwordPath(const Napi::CallbackInfo& info)
     Napi::HandleScope scope(env);
 
     FileSystemHelper fsHelper;
+    if (this->customHomeDir != "") {
+      fsHelper.setCustomHomeDir(customHomeDir);
+    }
+
     Napi::String swordPath = Napi::String::New(env, fsHelper.getUserSwordDir());
     unlockApi();
     return swordPath;

package/src/napi_module/node_sword_interface.hpp

@@ -112,6 +112,8 @@ private:
     SwordTranslationHelper* _swordTranslationHelper;
     SwordStatusReporter _swordStatusReporter;
     ModuleSearchWorker* _currentModuleSearchWorker;
+
+    std::string customHomeDir;
 };
 
 #endif // _NODE_SWORD_INTERFACE

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_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

@@ -138,6 +138,14 @@ string TextProcessor::getFilteredText(const string& text, int chapter, int verse
     secHead << "chapter=\"" << chapter << "\"";
     this->findAndReplaceAll(filteredText, secHeadClassFilter, secHead.str());
 
+    if (filteredText.find("subType=\"x-Chapter") != string::npos ||
+        filteredText.find("type=\"chapter") != string::npos) {
+
+      static string swordSectionTitle = "sword-section-title";
+      static string swordSectionTitleChapter = "sword-section-title sword-chapter-title";
+      this->findAndReplaceAll(filteredText, swordSectionTitle, swordSectionTitleChapter);
+    }
+
     this->findAndReplaceAll(filteredText, titleEndElementFilter, "</div>");
     this->findAndReplaceAll(filteredText, segStartElementFilter, "");
     this->findAndReplaceAll(filteredText, segEndElementFilter, "");