cordova-plugin-crosswire-sword 0.2.4 → 0.2.6

package/README.md

@@ -33,7 +33,7 @@ Although the object is in the global scope, it is not available until after the
 	var moduleName = 'KJV';
 	var verse = 'Jn.3.16';
 
-	SWORD.mgr.getModuleByName(moduleName, function (module) {
+	SWORD.mgr.getModuleByName(moduleName, function(module) {
 		module.setKeyText(verse, function() {
 			module.getRenderText(function(entryText) {
 				console.log(verse + ': ' + entryText + '(' + moduleName + ')');
@@ -100,6 +100,7 @@ Although the object is in the global scope, it is not available until after the
 
 	SWModule.setKeyText
 	SWModule.search
+	SWModule.terminateSearch
 	SWModule.getKeyText
 	SWModule.getRenderText
 	SWModule.getStripText

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-crosswire-sword",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "The SWORD Project Plugin",
   "cordova": {
     "id": "cordova-plugin-crosswire-sword",

package/plugin.xml

@@ -4,7 +4,7 @@
     xmlns:rim="http://www.blackberry.com/ns/widgets"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="cordova-plugin-crosswire-sword"
-    version="0.2.4">
+    version="0.2.6">
     <name>cordova-plugin-crosswire-sword</name>
     <description>The SWORD Project Plugin</description>
     <license>GNU 2.0</license>
@@ -56,6 +56,22 @@
         <source-file src="libs/android/armeabi-v7a/libsword.so" target-dir="libs/armeabi-v7a" />
         <source-file src="libs/android/x86/libsword.so" target-dir="libs/x86" />
         <source-file src="libs/android/x86_64/libsword.so" target-dir="libs/x86_64" />
+        <source-file src="libs/android/arm64-v8a/libcrypto.so" target-dir="libs/arm64-v8a" />
+        <source-file src="libs/android/armeabi-v7a/libcrypto.so" target-dir="libs/armeabi-v7a" />
+        <source-file src="libs/android/x86/libcrypto.so" target-dir="libs/x86" />
+        <source-file src="libs/android/x86_64/libcrypto.so" target-dir="libs/x86_64" />
+        <source-file src="libs/android/arm64-v8a/libc++_shared.so" target-dir="libs/arm64-v8a" />
+        <source-file src="libs/android/armeabi-v7a/libc++_shared.so" target-dir="libs/armeabi-v7a" />
+        <source-file src="libs/android/x86/libc++_shared.so" target-dir="libs/x86" />
+        <source-file src="libs/android/x86_64/libc++_shared.so" target-dir="libs/x86_64" />
+        <source-file src="libs/android/arm64-v8a/libcurl.so" target-dir="libs/arm64-v8a" />
+        <source-file src="libs/android/armeabi-v7a/libcurl.so" target-dir="libs/armeabi-v7a" />
+        <source-file src="libs/android/x86/libcurl.so" target-dir="libs/x86" />
+        <source-file src="libs/android/x86_64/libcurl.so" target-dir="libs/x86_64" />
+        <source-file src="libs/android/arm64-v8a/libssl.so" target-dir="libs/arm64-v8a" />
+        <source-file src="libs/android/armeabi-v7a/libssl.so" target-dir="libs/armeabi-v7a" />
+        <source-file src="libs/android/x86/libssl.so" target-dir="libs/x86" />
+        <source-file src="libs/android/x86_64/libssl.so" target-dir="libs/x86_64" />
 
 <!-- no longer needed with latest ndk
         <source-file src="libs/android/arm64-v8a/libc++_shared.so" target-dir="libs/arm64-v8a" />

package/src/android/SWORD.java

@@ -159,7 +159,7 @@ public class SWORD extends CordovaPlugin {
 			m.put("shortCopyright", mod.getConfigEntry("ShortCopyright"));
 			m.put("shortPromo", mod.getConfigEntry("ShortPromo"));
 			m.put("cipherKey", mod.getConfigEntry("CipherKey"));
-Log.d(TAG, "SWModule_getRemoteModuleByName("+args.getString(0)+", " + args.getString(1) + " returned successfully.");
+//Log.d(TAG, "SWModule_getRemoteModuleByName("+args.getString(0)+", " + args.getString(1) + " returned successfully.");
 			callbackContext.success(m);
 		}
 		else if (action.equals("InstallMgr_remoteInstallModule")) {
@@ -295,6 +295,12 @@ Log.d(TAG, "SWModule_getRemoteModuleByName("+args.getString(0)+", " + args.getSt
 			if (mod == null) { callbackContext.error("couldn't find module: " + args.getString(0)); return true; }
 			callbackContext.success(mod.getKeyText());
 		}
+		else if (action.equals("SWModule_terminateSearch")) {
+			SWModule mod = mgr.getModuleByName(args.getString(0));
+			if (mod == null) { callbackContext.error("couldn't find module: " + args.getString(0)); return true; }
+			mod.terminateSearch();
+			callbackContext.success();
+		}
 		else if (action.equals("SWModule_search")) {
 			final SWModule mod = mgr.getModuleByName(args.getString(0));
 			final String expression = args.getString(1);
@@ -579,20 +585,20 @@ Log.d(TAG, "... finished renderChapter");
 			final String url      = args.getString(0);
 			final String postData = args.getString(1);
 			final int method      = args.getInt(2);
-Log.d(TAG, "about to spawn thread makeRequest(url: " + url + ", postData: " + postData + ", method: " + method);
+//Log.d(TAG, "about to spawn thread makeRequest(url: " + url + ", postData: " + postData + ", method: " + method);
 
 			cordova.getThreadPool().execute(new Runnable() {
 				private CallbackContext makeRequestContext = callbackContext;
 				@Override
 				public void run() {
 					String response = makeRequest(url, postData, method, null);
-Log.d(TAG, "received response from makeRequest with .length(): " + (response != null ? response.length() : "null"));
+//Log.d(TAG, "received response from makeRequest with .length(): " + (response != null ? response.length() : "null"));
 					PluginResult result = new PluginResult(PluginResult.Status.OK, response);
-Log.d(TAG, "added response to result object");
+//Log.d(TAG, "added response to result object");
 					result.setKeepCallback(false);
-Log.d(TAG, "setting result object keepCallback to false and calling sendPluginResult");
+//Log.d(TAG, "setting result object keepCallback to false and calling sendPluginResult");
 					makeRequestContext.sendPluginResult(result);
-Log.d(TAG, "finished calling sendPluginResult");
+//Log.d(TAG, "finished calling sendPluginResult");
 				}
 			});
 
@@ -631,20 +637,20 @@ Log.d(TAG, "finished calling sendPluginResult");
 
 		String currentKey[]   = masterMod.getKeyChildren();
 
-Log.d(TAG, "getRenderChapter: checking currentKey");
+//Log.d(TAG, "getRenderChapter: checking currentKey");
 		// assert we have a valid location
 		if (currentKey.length <= SWModule.VERSEKEY_BOOKABBREV || currentKey.length <= SWModule.VERSEKEY_CHAPTER) return r;
-Log.d(TAG, "getRenderChapter: currentKey valid.");
+//Log.d(TAG, "getRenderChapter: currentKey valid.");
 
 		masterMod.setKeyText(currentKey[SWModule.VERSEKEY_BOOKABBREV]+"."+currentKey[SWModule.VERSEKEY_CHAPTER]+".1");
-Log.d(TAG, "getRenderChapter: masterMod.setKeyText returned.");
+//Log.d(TAG, "getRenderChapter: masterMod.setKeyText returned.");
 
 		String [] verseKey = masterMod.getKeyChildren();
 		while (
 				   masterMod.error() == 0
 				&& currentKey[SWModule.VERSEKEY_BOOK].equals(verseKey[SWModule.VERSEKEY_BOOK])
 				&& currentKey[SWModule.VERSEKEY_CHAPTER].equals(verseKey[SWModule.VERSEKEY_CHAPTER])) {
-Log.d(TAG, "looping chapter: " + verseKey[SWModule.VERSEKEY_OSISREF]);
+//Log.d(TAG, "looping chapter: " + verseKey[SWModule.VERSEKEY_OSISREF]);
 
 			mod.setKeyText(verseKey[SWModule.VERSEKEY_OSISREF]);
 			char error = mod.error();
@@ -669,7 +675,7 @@ Log.d(TAG, "looping chapter: " + verseKey[SWModule.VERSEKEY_OSISREF]);
 			masterMod.next();
 			verseKey = masterMod.getKeyChildren();
 		}
-Log.d(TAG, "Done looping chapter");
+//Log.d(TAG, "Done looping chapter");
 
 		masterMod.setKeyText(saveMasterKey);
 		mod.setKeyText(saveKey);
@@ -704,14 +710,14 @@ Log.d(TAG, "makeRequest(url: " + url + ", postData: " + postData + ", method: "
 		defaultHeaders.put("Accept", "*/*");
 //		defaultHeaders.put("Content-Type", "application/xml");
 	 	defaultHeaders.put("Content-Type", "application/x-www-form-urlencoded");
-Log.d(TAG, "about to add postData length to header");
+//Log.d(TAG, "about to add postData length to header");
 		if (method != METHOD_GET && postData != null) defaultHeaders.put("Content-Length", Integer.toString(postData.length()));
-Log.d(TAG, "finished adding postData length to header");
+//Log.d(TAG, "finished adding postData length to header");
 
 		try {
-Log.d(TAG, "adding any given headers");
+//Log.d(TAG, "adding any given headers");
 			if (headers != null) defaultHeaders.putAll(headers);
-Log.d(TAG, "done adding any given headers");
+//Log.d(TAG, "done adding any given headers");
 
 			if (method == METHOD_GET && postData != null && postData.length() > 0) {
 				// some sanity checks for appending GET params to URL
@@ -721,16 +727,16 @@ Log.d(TAG, "done adding any given headers");
 				url += postData;
 			}
 
-Log.d(TAG, "opening connection");
+//Log.d(TAG, "opening connection");
 			connection = (HttpURLConnection) new URL(url).openConnection();
-Log.d(TAG, "setting request method");
+//Log.d(TAG, "setting request method");
 			connection.setRequestMethod(METHODS_TEXT[method]);
-Log.d(TAG, "setting request properties");
+//Log.d(TAG, "setting request properties");
 			for (String k : defaultHeaders.keySet()) {
 				connection.setRequestProperty(k, defaultHeaders.get(k));
 			}
 			if (method == METHOD_POST) {
-Log.d(TAG, "sending post data");
+//Log.d(TAG, "sending post data");
 				connection.setDoOutput(true);
 				if (postData != null) {
 					DataOutputStream dos = new DataOutputStream(connection.getOutputStream());
@@ -739,10 +745,10 @@ Log.d(TAG, "sending post data");
 					dos.close();
 				}
 			}
-Log.d(TAG, "getting response code");
+//Log.d(TAG, "getting response code");
 			int responseCode = connection.getResponseCode();
 Log.d(TAG, "response code: " + responseCode);
-Log.d(TAG, "getting response");
+//Log.d(TAG, "getting response");
 			BufferedReader br = new BufferedReader(new InputStreamReader(connection.getInputStream()));
 			StringBuilder response = new StringBuilder();
 			String line;
@@ -758,7 +764,7 @@ Log.d(TAG, "finished. returning response with .length(): " + response.length());
 			return response.toString();
 		}
 		catch (Exception e) {
-Log.d(TAG, "an exception occurred in makeRequest thread: " + e);
+Log.i(TAG, "an exception occurred in makeRequest thread: " + e);
 			e.printStackTrace();
 		}
 		return null;

package/src/ios/SWORD.swift

@@ -350,7 +350,7 @@ debugPrint("initMgr, mgr: " + String(describing: mgr))
                 "name": vkInfo[VERSEKEY_BOOKNAME],
                 "abbrev": vkInfo[VERSEKEY_BOOKABBREV],
                 "osisName": vkInfo[VERSEKEY_OSISBOOKNAME],
-                "chapterMax": Int(vkInfo[VERSEKEY_CHAPTERMAX]),
+                "chapterMax": Int(vkInfo[VERSEKEY_CHAPTERMAX])!,
             ] as [AnyHashable : Any]
             retVal.append(bookInfo)
 
@@ -671,7 +671,7 @@ debugPrint("initMgr, mgr: " + String(describing: mgr))
         let saveMasterKey = String(cString: org_crosswire_sword_SWModule_getKeyText(masterMod))
         let saveKey = String(cString: org_crosswire_sword_SWModule_getKeyText(mod))
         var r = [[String: Any]]()
-        var currentKey = getStringArray(buffer: org_crosswire_sword_SWModule_getKeyChildren(masterMod))
+        let currentKey = getStringArray(buffer: org_crosswire_sword_SWModule_getKeyChildren(masterMod))
         let book = currentKey[VERSEKEY_BOOKABBREV]
         let chapter = currentKey[VERSEKEY_CHAPTER]
         org_crosswire_sword_SWModule_setKeyText(masterMod, book + "." + chapter + ".1")
@@ -724,6 +724,14 @@ debugPrint("initMgr, mgr: " + String(describing: mgr))
         return retVal;
     }
 
+    @objc(SWModule_terminateSearch:)
+    func SWModule_terminateSearch(command: CDVInvokedUrlCommand) {
+        let module = getModule(command: command)
+        if (module != 0) {
+            org_crosswire_sword_SWModule_terminateSearch(module)
+            self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: "SWModule_terminateSearch"), callbackId: command.callbackId)
+        }
+    }
     
     @objc(SWModule_search:)
     func SWModule_search(command: CDVInvokedUrlCommand) {

package/www/SWORD.js

@@ -118,6 +118,15 @@ SWModule.prototype.setKeyText = function(keyText, callback) {
 	return retVal;
 }
 
+SWModule.prototype.terminateSearch = function(callback) {
+	var retVal = null;
+	exec(callback?callback:function(r) { retVal = r; },
+		function(err) { utils.alert('[ERROR] problem: ' + err); },
+		"SWORD", "SWModule_terminateSearch", [this.name]
+	);
+	return retVal;
+}
+
 SWModule.prototype.search = function(expression, searchType, flags, scope, callback) {
 	var retVal = null;
 	exec(callback?callback:function(r) { retVal = r; },