node-sword-interface 0.242.0 → 0.246.0

package/locales.d/hu-utf8.conf

@@ -1,14 +1,18 @@
+# Locale provided and updated by:
+# Cyrille <lafricain79@gmail.com>
+# István Sánta <pista.santa@gmail.com>
+
 [Meta]
 Name=hu
 Description=Magyar
 Encoding=UTF-8
 
 [Text]
-Genesis=Mózes I
-Exodus=Mózes II
-Leviticus=Mózes III
-Numbers=Mózes IV
-Deuteronomy=Mózes V
+Genesis=I Mózes
+Exodus=II Mózes
+Leviticus=III Mózes
+Numbers=IV Mózes
+Deuteronomy=V Mózes
 Joshua=Józsué
 Judges=Bírák
 Ruth=Ruth
@@ -33,14 +37,14 @@ Ezekiel=Ezékiel
 Daniel=Dániel
 Hosea=Hóseás
 Joel=Jóel
-Amos=Ámós
+Amos=Ámósz
 Obadiah=Abdiás
 Jonah=Jónás
 Micah=Mikeás
 Nahum=Náhum
 Habakkuk=Habakuk
-Zephaniah=Sofóniás
-Haggai=Aggeus
+Zephaniah=Zofóniás
+Haggai=Haggeus
 Zechariah=Zakariás
 Malachi=Malakiás
 Matthew=Máté
@@ -77,7 +81,7 @@ Tobit=Tóbiás
 # Judith
 Judith=Judit
 # Esther (Greek)
-#Esther (Greek)=Ester greco
+#Esther (Greek)=Eszter (görög)
 # Additions to Esther
 Additions to Esther=Eszter könyvének kiegészítései
 # Wisdom
@@ -119,7 +123,7 @@ Additional Psalm=Zsoltárok könyvének kiegészítései
 
 # Vulgate & other later Latin mss* (6)
 # Laodiceans
-Laodiceans=Laodiceaikhoz írott levél
+Laodiceans=Laodiceaiakhoz írott levél
 # V Ezra
 V Ezra=Ezdrás ötödik könyve
 # IV Ezra
@@ -150,7 +154,7 @@ Deut=5Móz
 # Joshua
 Josh=Józs
 # Judges
-Judg=Bírák
+Judg=Bír
 # Ruth
 Ruth=Ruth
 # I Samuel
@@ -166,7 +170,7 @@ Ruth=Ruth
 # II Chronicles
 2Chr=2Krón
 # Ezra
-Ezra=Ezsdr
+Ezra=Ezsd
 # Nehemiah
 Neh=Neh
 # Esther
@@ -176,17 +180,17 @@ Job=Jób
 # Psalms
 Ps=Zsolt
 # Proverbs
-Prov=Példa
+Prov=Péld
 # Ecclesiastes
 Eccl=Préd
 # Song of Solomon
-Song=Ének
+Song=Énekek
 # Isaiah
 Isa=Ézs
 # Jeremiah
 Jer=Jer
 # Lamentations
-Lam=Jer sir
+Lam=JSir
 # Ezekiel
 Ezek=Ez
 # Daniel
@@ -196,7 +200,7 @@ Hos=Hós
 # Joel
 Joel=Jóel
 # Amos
-Amos=Ámosz
+Amos=Ám
 # Obadiah
 Obad=Abd
 # Jonah
@@ -208,9 +212,9 @@ Nah=Náh
 # Habakkuk
 Hab=Hab
 # Zephaniah
-Zeph=Zef
+Zeph=Zof
 # Haggai
-Hag=Hagg
+Hag=Hag
 # Zechariah
 Zech=Zak
 # Malachi
@@ -226,7 +230,7 @@ Luke=Lk
 # John
 John=Jn
 # Acts
-Acts=Ap.csel
+Acts=ApCsel
 # Romans
 Rom=Róm
 # I Corinthians
@@ -242,9 +246,9 @@ Phil=Fil
 # Colossians
 Col=Kol
 # I Thessalonians
-1Thess=1Thesz
+1Thess=1Thessz
 # II Thessalonians
-2Thess=2Thesz
+2Thess=2Thessz
 # I Timothy
 1Tim=1Tim
 # II Timothy
@@ -256,11 +260,11 @@ Phlm=Filem
 # Hebrews
 Heb=Zsid
 # James
-Jas=Jk
+Jas=Jak
 # I Peter
-1Pet=1Pét
+1Pet=1Pt
 # II Peter
-2Pet=2Pét
+2Pet=2Pt
 # I John
 1John=1Jn
 # II John
@@ -290,7 +294,7 @@ Sir=Sir
 # Baruch
 Bar=Báruk
 # Epistle of Jeremiah
-EpJer=Jer
+EpJer=JerLev
 # Daniel (Greek)
 DanGr=Dán (gör)
 # Additions to Daniel
@@ -300,7 +304,7 @@ PrAzar=Aza
 # Susanna
 Sus=Zsuzs
 # Bel and the Dragon
-Bel=Baák
+Bel=Baál
 # I Maccabees
 1Macc=1Mak
 # II Maccabees
@@ -359,6 +363,7 @@ I MAKKABEUSOK=1Macc
 1 PÉTER=1Pet
 1. PÉTER=1Pet
 1PÉTER=1Pet
+1PT=1Pet
 1SÁM=1Sam
 1 SÁM=1Sam
 1 SÁMUEL=1Sam
@@ -399,6 +404,7 @@ II MAKKABEUSOK=2Macc
 2 PÉTER=2Pet
 2. PÉTER=2Pet
 2PÉTER=2Pet
+2PT=2Pet
 2SÁM=2Sam
 2 SÁMUEL=2Sam
 2. SÁMUEL=2Sam
@@ -440,8 +446,11 @@ ABDIÁS=Obad
 ABD=Obad
 AGGEUS=Hag
 ÁMÓS=Amos
+ÁMOS=Amos
+AMOS=Amos
 ÁMOSZ=Amos
-AP.CSEL=Acts
+ÁMÓSZ=Amos
+APCSEL=Acts
 APOSTOLOK CSELEKEDETEI=Acts
 AZARIÁS IMÁJA=PrAzar
 AZA=PrAzar
@@ -477,7 +486,7 @@ GALATA=Gal
 GAL=Gal
 HABAKUK=Hab
 HAB=Hab
-HAGG=Hag
+HAGGEUS=Hag
 HÓSEÁS=Hos
 HÓS=Hos
 JAKAB=Jas
@@ -491,8 +500,11 @@ JEREMIÁS=Jer
 JEREMIÁS SIRALMAI=Lam
 JEREMIÁS LEVELE=EpJer
 JER=EpJer
+JERLEV=EpJer
 JER=Jer
 JER SIR=Lam
+JERSIR=Lam
+JSIR=Lam
 JK=Jas
 JN=John
 JÓB=Job
@@ -526,11 +538,11 @@ MÁTÉ=Matt
 MIKEÁS=Mic
 MIK=Mic
 MK=Mark
-MÓZES I=Gen
-MÓZES II=Exod
-MÓZES III=Lev
-MÓZES IV=Num
-MÓZES V=Deut
+I MÓZES=Gen
+II MÓZES=Exod
+III MÓZES=Lev
+IV MÓZES=Num
+V MÓZES=Deut
 MT=Matt
 NÁH=Nah
 NÁHUM=Nah
@@ -555,6 +567,7 @@ SIR (ELŐ)=SirP
 SIRÁK FIA=Sir
 SIR=Sir
 SOFÓNIÁS=Zeph
+ZOFÓNIÁS=Zeph
 I THESSZALONIKA=1Thess
 II THESSZALONIKA=2Thess
 I TIMÓTEUS=1Tim

package/locales.d/ru-utf8.conf

@@ -2,8 +2,9 @@
 # БИБЛИЯ, КНИГИ СВЯЩЕННОГО ПИСАНИЯ ВЕТХОГО И НОВОГО ЗАВЕТА.
 # Працює під Linux і Windows версії проекту SWORD
 # Pavlo Bohmat bohm@ukr.net
-
 # Converted with iconv by Martin Gruner
+# Updates from Evgen Kucherov <zhuke@ukr.net>
+
 
 [Meta]
 Name=ru

package/locales.d/ru_RU-utf8.conf

@@ -2,8 +2,9 @@
 # БИБЛИЯ, КНИГИ СВЯЩЕННОГО ПИСАНИЯ ВЕТХОГО И НОВОГО ЗАВЕТА.
 # Працює під Linux і Windows версії проекту SWORD
 # Pavlo Bohmat bohm@ukr.net
-
 # Converted with iconv by Martin Gruner
+# Updates from Evgen Kucherov <zhuke@ukr.net>
+
 
 [Meta]
 Name=ru

package/locales.d/uk-utf8.conf

@@ -2,6 +2,7 @@
 # БІБЛІЯ або КНИГИ СВЯТОГО ПИСЬМА СТАРОГО Й НОВОГО ЗАПОВІТУ
 # Працює під Linux і Windows версії проекту SWORD
 # Pavlo Bohmat bohm@ukr.net
+# Updates from Evgen Kucherov <zhuke@ukr.net>
 
 [Meta]
 Name=uk

package/locales.d/vi-utf8.conf

@@ -158,6 +158,7 @@ EXƠRA=Ezra
 ÊXƠTÊ=Esth
 ÊXƠTÊ (TIẾNG HY LẠP)=EsthGr
 GALATI=Gal
+GI=John
 GIACƠ=Jas
 GIĂNG=John
 GIÊRÊMI=Jer
@@ -181,6 +182,28 @@ I SAMUÊN=1Sam
 I SỬ KÝ=1Chr
 I TÊSALÔNICA=1Thess
 I TIMÔTHÊ=1Tim
+1 CÁC VUA=1Kgs
+1 CÔRINHTÔ=1Cor
+1 ENOCH=1En
+1 ESDRAS=1Esd
+1 GIĂNG=1John
+1 MEQABYAN=1Meq
+1 PHIERƠ=1Pet
+1 SAMUÊN=1Sam
+1 SỬ KÝ=1Chr
+1 TÊSALÔNICA=1Thess
+1 TIMÔTHÊ=1Tim
+1CÁC VUA=1Kgs
+1CÔRINHTÔ=1Cor
+1ENOCH=1En
+1ESDRAS=1Esd
+1GIĂNG=1John
+1MEQABYAN=1Meq
+1PHIERƠ=1Pet
+1SAMUÊN=1Sam
+1SỬ KÝ=1Chr
+1TÊSALÔNICA=1Thess
+1TIMÔTHÊ=1Tim
 II BARÚC=2Bar
 II CÁC VUA=2Kgs
 II CÔRINHTÔ=2Cor
@@ -192,9 +215,37 @@ II SAMUÊN=2Sam
 II SỬ KÝ=2Chr
 II TÊSALÔNICA=2Thess
 II TIMÔTHÊ=2Tim
+2 BARÚC=2Bar
+2 CÁC VUA=2Kgs
+2 CÔRINHTÔ=2Cor
+2 ESDRAS=2Esd
+2 GIĂNG=2John
+2 MEQABYAN=2Meq
+2 PHIERƠ=2Pet
+2 SAMUÊN=2Sam
+2 SỬ KÝ=2Chr
+2 TÊSALÔNICA=2Thess
+2 TIMÔTHÊ=2Tim
+2BARÚC=2Bar
+2CÁC VUA=2Kgs
+2CÔRINHTÔ=2Cor
+2ESDRAS=2Esd
+2GIĂNG=2John
+2MEQABYAN=2Meq
+2PHIERƠ=2Pet
+2SAMUÊN=2Sam
+2SỬ KÝ=2Chr
+2TÊSALÔNICA=2Thess
+2TIMÔTHÊ=2Tim
 III GIĂNG=3John
 III MEQABYAN=3Meq
+3 GIĂNG=3John
+3 MEQABYAN=3Meq
+3GIĂNG=3John
+3MEQABYAN=3Meq
 IV BARÚC=4Bar
+4 BARÚC=4Bar
+4BARÚC=4Bar
 JUBILEES=Jub
 KHẢI HUYỀN=Rev
 KHÔN NGOAN=Wis

package/package.json

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

package/scripts/build_sword.sh

@@ -2,7 +2,7 @@
 
 #   This file is part of node-sword-interface.
 #
-#   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+#   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 #
 #   node-sword-interface is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -31,6 +31,9 @@ fi
 
 # CLONE SWORD
 git clone https://github.com/bibletime/crosswire-sword-mirror sword
+git -C sword checkout 1460f9
+patch --batch --forward -d sword -p 0 < patch/sword_globconf.patch
+
 
 # PATCHES
 case "$(uname -s)" in
@@ -53,10 +56,6 @@ if [ "$1" = "--android" ] ; then
   git clone https://github.com/karlkleinpaste/biblesync.git
   git -C biblesync checkout 2.1.0
 
-  # Use a newer version of SWORD on ANDROID, which brings built-in Unicode support
-  git -C sword checkout 60b6e1
-  patch --batch --forward -d sword -p 0 < patch/sword_globconf.patch
-
   echo "-- TARGET ARCH: $2"
   TARGET_ARCH=$2
 
@@ -82,9 +81,6 @@ if [ "$1" = "--android" ] ; then
 else
   # macOS & Linux
 
-  git -C sword checkout 412026
-  patch --batch --forward -d sword -p 0 < patch/sword_globconf.patch
-
   cd sword_build
   cmake -DLIBSWORD_LIBRARY_TYPE=Static -DCMAKE_CXX_STANDARD=11 ../sword
 fi

package/scripts/get_sword_build_win32.ps1

@@ -1,6 +1,6 @@
 #   This file is part of node-sword-interface.
 #
-#   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+#   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 #
 #   node-sword-interface is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@ $AllProtocols = [System.Net.SecurityProtocolType]'Tls11,Tls12'
 [System.Net.ServicePointManager]::SecurityProtocol = $AllProtocols
 
 # --- Set the uri for the release
-$URI = "https://api.github.com/repos/ezra-project/sword-build-win32/releases/tags/v1.8.900-2020-11-04"
+$URI = "https://api.github.com/repos/ezra-project/sword-build-win32/releases/tags/v1.8.900-2022-01-02"
 
 # --- Query the API to get the url of the zip
 $Response = Invoke-RestMethod -Method Get -Uri $URI

package/scripts/get_sword_include_path.sh

@@ -2,7 +2,7 @@
 
 #   This file is part of node-sword-interface.
 #
-#   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+#   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 #
 #   node-sword-interface is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by

package/scripts/get_sword_library.sh

@@ -2,7 +2,7 @@
 
 #   This file is part of node-sword-interface.
 #
-#   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+#   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 #
 #   node-sword-interface is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by

package/src/napi_module/api_lock.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/api_lock.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/binding.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/install_module_worker.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/install_module_worker.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/module_search_worker.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/module_search_worker.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/napi_sword_helper.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/napi_sword_helper.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/node_sword_interface.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/node_sword_interface.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/worker.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

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/common_defs.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/file_system_helper.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/file_system_helper.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/module_helper.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/module_helper.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/module_installer.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/module_installer.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/module_search.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -108,7 +108,7 @@ vector<Verse> ModuleSearch::getModuleSearchResults(string moduleName,
 
     if (!useExtendedVerseBoundaries) {
         // Use strict search boundaries (only search within individual verses). TODO: Make this configurable.
-        flags |= SEARCHFLAG_STRICTBOUNDARIES;
+        flags |= SWModule::SEARCHFLAG_STRICTBOUNDARIES;
     }
 
     if (module == 0) {
@@ -142,7 +142,7 @@ vector<Verse> ModuleSearch::getModuleSearchResults(string moduleName,
 
             // from swmodule.h api docs:
             // for use with entryAttrib search type to match whole entry to value, e.g., G1234 and not G12345
-            flags |= SEARCHFLAG_MATCHWHOLEENTRY;
+            flags |= SWModule::SEARCHFLAG_MATCHWHOLEENTRY;
 
             searchTerm = "Word//Lemma./" + searchTerm;
         }

package/src/sword_backend/module_search.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by