node-sword-interface 1.0.0 → 1.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/README.md +1 -0
  2. package/package.json +1 -1
  3. package/scripts/build_sword.sh +1 -1
  4. package/scripts/get_sword_build_win32.ps1 +1 -1
  5. package/src/node_sword_cli.cpp +2 -2
  6. package/src/sword_backend/module_installer.cpp +2 -4
  7. package/src/sword_backend/text_processor.cpp +4 -2
package/README.md CHANGED
@@ -11,6 +11,7 @@ node-sword-interface focusses on discovery, installation/removal and text loadin
11
11
  - List SWORD repositories
12
12
  - List remote modules (Bible modules or dictionary modules)
13
13
  - List local modules (Bible modules or dictionary modules)
14
+ - Get a list of updated modules
14
15
  - Install a module
15
16
  - Uninstall a module
16
17
  - Get information about a module
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "node-sword-interface",
3
- "version": "1.0.0",
3
+ "version": "1.0.2",
4
4
  "description": "Javascript (N-API) interface to SWORD library",
5
5
  "keywords": [
6
6
  "C++",
package/scripts/build_sword.sh CHANGED
@@ -82,7 +82,7 @@ else
82
82
  # macOS & Linux
83
83
 
84
84
  cd sword_build
85
- cmake -DLIBSWORD_LIBRARY_TYPE=Static -DCMAKE_CXX_STANDARD=11 ../sword
85
+ cmake -DLIBSWORD_LIBRARY_TYPE=Static -DCMAKE_CXX_STANDARD=11 -DCMAKE_BUILD_TYPE=Release ../sword
86
86
  fi
87
87
 
88
88
  make -j4 sword_static
package/scripts/get_sword_build_win32.ps1 CHANGED
@@ -30,7 +30,7 @@ $AllProtocols = [System.Net.SecurityProtocolType]'Tls11,Tls12'
30
30
  [System.Net.ServicePointManager]::SecurityProtocol = $AllProtocols
31
31
 
32
32
  # --- Set the uri for the release
33
- $URI = "https://api.github.com/repos/ezra-project/sword-build-win32/releases/tags/v1.8.900-2022-01-02"
33
+ $URI = "https://api.github.com/repos/ezra-bible-app/sword-build-win32/releases/tags/v1.8.900-2022-11-06"
34
34
 
35
35
  # --- Query the API to get the url of the zip
36
36
  $Response = Invoke-RestMethod -Method Get -Uri $URI
package/src/node_sword_cli.cpp CHANGED
@@ -88,8 +88,8 @@ void get_repo_module(RepositoryInterface& repoInterface)
88
88
 
89
89
  void get_updated_repo_modules(RepositoryInterface& repoInterface)
90
90
  {
91
- ModuleStore moduleStore;
92
- ModuleHelper moduleHelper(moduleStore);
91
+ //ModuleStore moduleStore;
92
+ //ModuleHelper moduleHelper(moduleStore);
93
93
 
94
94
  vector<SWModule*> updatedModules = repoInterface.getUpdatedRepoModules();
95
95
 
package/src/sword_backend/module_installer.cpp CHANGED
@@ -88,10 +88,9 @@ int ModuleInstaller::installModule(string repoName, string moduleName)
88
88
  this->resetAllMgrs();
89
89
 
90
90
  if (result != 0) {
91
- //cerr << "Error installing module: " << moduleName << " (write permissions?)" << endl;
91
+ // cerr << "Error installing module: " << moduleName << " (write permissions?)" << endl;
92
92
  return result;
93
93
  } else {
94
- //cout << "Installed module: " << moduleName << endl;
95
94
  return 0;
96
95
  }
97
96
  }
@@ -109,10 +108,9 @@ int ModuleInstaller::uninstallModule(string moduleName)
109
108
  this->_moduleStore.deleteModule(moduleName);
110
109
 
111
110
  if (error) {
112
- cerr << "Error uninstalling module: " << moduleName << " (write permissions?)" << endl;
111
+ // cerr << "Error uninstalling module: " << moduleName << " (write permissions?)" << endl;
113
112
  return -1;
114
113
  } else {
115
- cout << "Uninstalled module: " << moduleName << endl;
116
114
  return 0;
117
115
  }
118
116
  }
package/src/sword_backend/text_processor.cpp CHANGED
@@ -68,6 +68,7 @@ string TextProcessor::getFilteredText(const string& text, int chapter, int verse
68
68
  static string pbElementFilter = "<pb";
69
69
  static string quoteJesusElementFilter = "<q marker=\"\" who=\"Jesus\">";
70
70
  static string quoteElementFilter = "<q ";
71
+ static string quoteEndElementFilter = "</q>";
71
72
  static string titleStartElementFilter = "<title";
72
73
  static string titleEndElementFilter = "</title>";
73
74
  static string segStartElementFilter = "<seg>";
@@ -154,8 +155,9 @@ string TextProcessor::getFilteredText(const string& text, int chapter, int verse
154
155
  this->findAndReplaceAll(filteredText, xBrFilter, "x-br\"/> ");
155
156
  this->findAndReplaceAll(filteredText, divSIDFilter, "<div class=\"sword-markup sword-sid\" sID=");
156
157
  this->findAndReplaceAll(filteredText, divEIDFilter, "<div class=\"sword-markup sword-eid\" eID=");
157
- this->findAndReplaceAll(filteredText, quoteJesusElementFilter, "<div class=\"sword-markup sword-quote-jesus\"/>");
158
- this->findAndReplaceAll(filteredText, quoteElementFilter, "&quot;<div class=\"sword-markup sword-quote\" ");
158
+ this->findAndReplaceAll(filteredText, quoteJesusElementFilter, "<div class=\"sword-markup sword-quote-jesus\">");
159
+ this->findAndReplaceAll(filteredText, quoteElementFilter, "<div class=\"sword-markup sword-quote\" ");
160
+ this->findAndReplaceAll(filteredText, quoteEndElementFilter, "</div>");
159
161
  this->findAndReplaceAll(filteredText, divineNameStartElement, "");
160
162
  this->findAndReplaceAll(filteredText, divineNameEndElement, "");
161
163
  this->findAndReplaceAll(filteredText, strongsWElement, "<w class=");