node-sword-interface 0.245.0 → 0.246.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-sword-interface",
-  "version": "0.245.0",
+  "version": "0.246.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)
 {
@@ -475,7 +473,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 +482,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