node-sword-interface 1.0.100 → 1.0.102

package/package.json

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

package/src/node_sword_cli.cpp

@@ -130,7 +130,7 @@ void get_book_intro(TextProcessor& text_processor)
 {
     cout << "Text:" << endl;
     text_processor.enableMarkup();
-    string bookIntro = text_processor.getBookIntroduction("GerNeUe", "John");
+    string bookIntro = text_processor.getBookIntroduction("NET", "Luke");
     cout << bookIntro << endl;
 }
 
@@ -226,11 +226,11 @@ int main(int argc, char** argv)
         cout << "Error installing module (write permissions?)\n";
     }*/
     
-    int error = moduleInstaller.uninstallModule("YLT");
+    /*int error = moduleInstaller.uninstallModule("YLT");
 
     if (error) {
         cout << "Error uninstalling module (write permissions?)\n";
-    }
+    }*/
 
     /*get_local_module(moduleStore);
     
@@ -241,11 +241,11 @@ int main(int argc, char** argv)
 
     //get_strongs_entry(textProcessor);
 
-    get_module_text(textProcessor);
+    //get_module_text(textProcessor);
 
     //get_reference_text(moduleStore, textProcessor);
 
-    //get_book_intro(textProcessor);
+    get_book_intro(textProcessor);
 
     //get_book_list(moduleHelper);
 

package/src/sword_backend/text_processor.cpp

@@ -540,18 +540,37 @@ string TextProcessor::getBookIntroduction(string moduleName, string bookCode)
     if (module == 0) {
         cerr << "getLocalModule returned zero pointer for " << moduleName << endl;
     } else {
+        // Get module data path BEFORE manipulating the module key
+        string moduleDataPath = this->_moduleStore.getModuleDataPath(module);
+        string moduleFileUrl = this->getFileUrl(moduleDataPath);
+
         module->setKeyText(bookCode.c_str());
-        VerseKey *verseKey = (VerseKey *)module->getKey();
+        
+        // Create a local VerseKey copy to avoid pointer invalidation issues
+        VerseKey verseKey = module->getKey();
 
         // Include chapter/book/testament/module intros
-        verseKey->setIntros(true);
-        verseKey->setChapter(0);
-        verseKey->setVerse(0);
+        verseKey.setIntros(true);
+        
+        // First try to get book intro from chapter 0, verse 0
+        verseKey.setChapter(0);
+        verseKey.setVerse(0);
         module->setKey(verseKey);
 
         bookIntroText = string(module->getRawEntry());
         StringHelper::trim(bookIntroText);
 
+        // If book intro (0:0) is empty, also fetch chapter 1:0
+        // Some modules (like NET) store book-level intro content in chapter 1:0
+        if (bookIntroText.empty()) {
+            verseKey.setChapter(1);
+            verseKey.setVerse(0);
+            module->setKey(verseKey);
+
+            bookIntroText = string(module->getRawEntry());
+            StringHelper::trim(bookIntroText);
+        }
+
         static regex titleStartElementFilter = regex("<title");
         static regex titleEndElementFilter = regex("</title>");
         static regex noteStartElementFilter = regex("<note");
@@ -570,7 +589,6 @@ string TextProcessor::getBookIntroduction(string moduleName, string bookCode)
         filteredText = regex_replace(filteredText, chapterDivFilter, "");
 
         // Prefix img src attributes starting with "/" with the module file URL
-        string moduleFileUrl = this->getFileUrl(this->_moduleStore.getModuleDataPath(module));
         if (!moduleFileUrl.empty()) {
             static string imgSrcSlash = "src=\"/";
             string imgSrcReplacement = "src=\"" + moduleFileUrl + "/";