node-sword-interface 1.0.98 → 1.0.100

package/package.json

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

package/src/node_sword_cli.cpp

@@ -105,11 +105,11 @@ void get_module_text(TextProcessor& text_processor)
 {
     cout << "Text:" << endl;
     text_processor.enableMarkup();
-    vector<Verse> verses = text_processor.getBookText("NASB", "Ps");
+    vector<Verse> verses = text_processor.getBookText("NET", "Luke");
     cout << "Got " << verses.size() << " verses!" << endl;
-    /*for (int i = 0; i < verses.size(); i++) {
+    for (int i = 0; i < 10; i++) {
         cout << verses[i].reference << "|" << verses[i].content << endl;
-    }*/
+    }
 }
 
 void get_reference_text(ModuleStore& module_store, TextProcessor& text_processor)
@@ -220,17 +220,17 @@ int main(int argc, char** argv)
 
     show_modules(repoInterface);
 
-    /*int error = moduleInstaller.installModule("UKJV");
+    /*int error = moduleInstaller.installModule("CrossWire", "UKJV");
 
     if (error) {
         cout << "Error installing module (write permissions?)\n";
-    }
+    }*/
     
-    error = moduleInstaller.uninstallModule("UKJV");
+    int error = moduleInstaller.uninstallModule("YLT");
 
     if (error) {
         cout << "Error uninstalling module (write permissions?)\n";
-    }*/
+    }
 
     /*get_local_module(moduleStore);
     
@@ -241,7 +241,7 @@ int main(int argc, char** argv)
 
     //get_strongs_entry(textProcessor);
 
-    //get_module_text(textProcessor);
+    get_module_text(textProcessor);
 
     //get_reference_text(moduleStore, textProcessor);
 

package/src/sword_backend/text_processor.cpp

@@ -30,6 +30,7 @@
 
 // Own includes
 #include "text_processor.hpp"
+#include "module_store.hpp"
 #include "module_helper.hpp"
 #include "string_helper.hpp"
 #include "strongs_entry.hpp"
@@ -45,7 +46,32 @@ TextProcessor::TextProcessor(ModuleStore& moduleStore, ModuleHelper& moduleHelpe
     this->_rawMarkupEnabled = false;
 }
 
-string TextProcessor::getFilteredText(const string& text, int chapter, int verseNr, bool hasStrongs, bool hasInconsistentClosingEndDivs)
+string TextProcessor::getFileUrl(const string& nativePath)
+{
+    if (nativePath.empty()) {
+        return "";
+    }
+
+    string path = nativePath;
+
+    // Strip trailing slash or backslash
+    if (!path.empty() && (path.back() == '/' || path.back() == '\\')) {
+        path.pop_back();
+    }
+
+    // Convert backslashes to forward slashes for URL compatibility
+    static regex backslash("\\\\");
+    path = regex_replace(path, backslash, "/");
+
+    // Build file:// URL (Windows needs extra slash for drive letter)
+#if _WIN32
+    return "file:///" + path;
+#else
+    return "file://" + path;
+#endif
+}
+
+string TextProcessor::getFilteredText(const string& text, int chapter, int verseNr, bool hasStrongs, bool hasInconsistentClosingEndDivs, const string& moduleFileUrl)
 {
     static string chapterFilter = "<chapter";
     static regex pbElement = regex("<pb .*?/> ");
@@ -218,10 +244,17 @@ string TextProcessor::getFilteredText(const string& text, int chapter, int verse
         filteredText = this->replaceSpacesInStrongs(filteredText);
     }
 
+    // Prefix img src attributes starting with "/" with the module file URL
+    if (!moduleFileUrl.empty()) {
+        static string imgSrcSlash = "src=\"/";
+        string imgSrcReplacement = "src=\"" + moduleFileUrl + "/";
+        this->findAndReplaceAll(filteredText, imgSrcSlash, imgSrcReplacement);
+    }
+
     return filteredText;
 }
 
-string TextProcessor::getCurrentChapterHeading(sword::SWModule* module)
+string TextProcessor::getCurrentChapterHeading(sword::SWModule* module, const string& moduleFileUrl)
 {
     string currentModuleName = string(module->getName());
     string chapterHeading = "";
@@ -254,7 +287,7 @@ string TextProcessor::getCurrentChapterHeading(sword::SWModule* module)
             // Therefore we do not render chapter headings for the first verse of the chapter in this case.
             chapterHeading = "";
         } else {
-            chapterHeading = this->getFilteredText(chapterHeading, currentChapter, currentVerseNr);
+            chapterHeading = this->getFilteredText(chapterHeading, currentChapter, currentVerseNr, false, false, moduleFileUrl);
         }
     }
 
@@ -262,6 +295,12 @@ string TextProcessor::getCurrentChapterHeading(sword::SWModule* module)
 }
 
 string TextProcessor::getCurrentVerseText(sword::SWModule* module, bool hasStrongs, bool hasInconsistentClosingEndDivs, bool forceNoMarkup)
+{
+    string moduleFileUrl = this->getFileUrl(this->_moduleStore.getModuleDataPath(module));
+    return this->getCurrentVerseText(module, hasStrongs, hasInconsistentClosingEndDivs, forceNoMarkup, moduleFileUrl);
+}
+
+string TextProcessor::getCurrentVerseText(sword::SWModule* module, bool hasStrongs, bool hasInconsistentClosingEndDivs, bool forceNoMarkup, const string& moduleFileUrl)
 {
     string verseText;
     string filteredText;
@@ -275,7 +314,7 @@ string TextProcessor::getCurrentVerseText(sword::SWModule* module, bool hasStron
         filteredText = verseText;
 
         if (!this->_rawMarkupEnabled) {
-            filteredText = this->getFilteredText(verseText, currentChapter, currentVerseNr, hasStrongs, hasInconsistentClosingEndDivs);
+            filteredText = this->getFilteredText(verseText, currentChapter, currentVerseNr, hasStrongs, hasInconsistentClosingEndDivs, moduleFileUrl);
         }
     } else {
         verseText = string(module->stripText());
@@ -358,6 +397,9 @@ vector<Verse> TextProcessor::getVersesFromReferences(string moduleName, vector<s
     bool moduleMarkupIsBroken = this->_moduleHelper.isBrokenMarkupModule(moduleName);
     bool hasInconsistentClosingEndDivs = this->_moduleHelper.isInconsistentClosingEndDivModule(moduleName);
 
+    // Compute file URL once for the entire module
+    string moduleFileUrl = this->getFileUrl(this->_moduleStore.getModuleDataPath(module));
+
     for (unsigned int i = 0; i < references.size(); i++) {
         string currentReference = references[i];
         string currentVerseText = "";
@@ -366,7 +408,7 @@ vector<Verse> TextProcessor::getVersesFromReferences(string moduleName, vector<s
         bool entryExisting = module->hasEntry(module->getKey());
 
         if (entryExisting) {
-          currentVerseText = this->getCurrentVerseText(module, false, hasInconsistentClosingEndDivs, moduleMarkupIsBroken);
+          currentVerseText = this->getCurrentVerseText(module, false, hasInconsistentClosingEndDivs, moduleMarkupIsBroken, moduleFileUrl);
         }
 
         Verse currentVerse;
@@ -414,6 +456,9 @@ vector<Verse> TextProcessor::getText(string moduleName, string key, QueryLimit q
     } else {
         bool hasStrongs = this->_moduleHelper.moduleHasGlobalOption(module, "Strongs");
 
+        // Compute file URL once for the entire module
+        string moduleFileUrl = this->getFileUrl(this->_moduleStore.getModuleDataPath(module));
+
         module->setKey(key.c_str());
 
         if (startVerseNumber >= 1) {
@@ -450,7 +495,7 @@ vector<Verse> TextProcessor::getText(string moduleName, string key, QueryLimit q
             // and if the module markup is not broken
             // and if the requested verse count is more than one or the default (-1 / all verses).
             if (firstVerseInChapter && !moduleMarkupIsBroken && (verseCount > 1 || verseCount == -1)) {
-                string chapterHeading = this->getCurrentChapterHeading(module);
+                string chapterHeading = this->getCurrentChapterHeading(module, moduleFileUrl);
                 verseText += chapterHeading;
             }
 
@@ -460,7 +505,8 @@ vector<Verse> TextProcessor::getText(string moduleName, string key, QueryLimit q
                                                    hasInconsistentClosingEndDivs,
                                                    // Note that if markup is broken this will enforce
                                                    // the usage of the "stripped" / non-markup variant of the text
-                                                   moduleMarkupIsBroken);
+                                                   moduleMarkupIsBroken,
+                                                   moduleFileUrl);
 
             // If the current verse does not have any content and if it is the first verse in this book
             // we assume that the book is not existing.
@@ -522,6 +568,14 @@ string TextProcessor::getBookIntroduction(string moduleName, string bookCode)
         filteredText = regex_replace(filteredText, headStartElementFilter, "<div class=\"sword-markup sword-head\"");
         filteredText = regex_replace(filteredText, headEndElementFilter, "</div>");
         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 + "/";
+            this->findAndReplaceAll(filteredText, imgSrcSlash, imgSrcReplacement);
+        }
     }
 
     return filteredText;

package/src/sword_backend/text_processor.hpp

@@ -63,8 +63,10 @@ private:
                                int startVerseNr=-1,
                                int verseCount=-1);
 
-    std::string getCurrentChapterHeading(sword::SWModule* module);
-    std::string getFilteredText(const std::string& text, int chapter, int verseNr, bool hasStrongs=false, bool hasInconsistentClosingEndDivs=false);
+    std::string getCurrentChapterHeading(sword::SWModule* module, const std::string& moduleFileUrl);
+    std::string getCurrentVerseText(sword::SWModule* module, bool hasStrongs, bool hasInconsistentClosingEndDivs, bool forceNoMarkup, const std::string& moduleFileUrl);
+    std::string getFilteredText(const std::string& text, int chapter, int verseNr, bool hasStrongs, bool hasInconsistentClosingEndDivs, const std::string& moduleFileUrl);
+    std::string getFileUrl(const std::string& nativePath);
     std::string replaceSpacesInStrongs(const std::string& text);
     unsigned int findAndReplaceAll(std::string & data, std::string toSearch, std::string replaceStr);