[sword-svn] r3539 - in branches/sword-1-8-x: . bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ios

[scribe at crosswire.org]

Author: scribe
Date: 2017-11-27 16:29:17 -0700 (Mon, 27 Nov 2017)
New Revision: 3539

Modified:
   branches/sword-1-8-x/
   branches/sword-1-8-x/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ios/SWORD.swift
Log:
merged one last binding fix into 1.8.x



Property changes on: branches/sword-1-8-x
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3459-3471,3473,3475,3477-3482,3485-3514,3516,3518-3523,3525-3536
   + /trunk:3459-3471,3473,3475,3477-3482,3485-3514,3516,3518-3523,3525-3536,3538

Modified: branches/sword-1-8-x/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ios/SWORD.swift
===================================================================
--- branches/sword-1-8-x/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ios/SWORD.swift	2017-11-27 23:26:18 UTC (rev 3538)
+++ branches/sword-1-8-x/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ios/SWORD.swift	2017-11-27 23:29:17 UTC (rev 3539)
@@ -280,7 +280,7 @@
         var retVal = [String]()
         org_crosswire_sword_SWModule_begin(mod)
         while (org_crosswire_sword_SWModule_popError(mod) == 0) {
-            retVal.append(getStringArray(buffer: org_crosswire_sword_SWModule_getKeyChildren(mod))[VERSEKEY_BOOKNAME])
+            retVal.append(getStringArray(buffer: org_crosswire_sword_SWModule_getKeyChildren(mod))[VERSEKEY_BOOKABBREV])
             org_crosswire_sword_SWModule_setKeyText(mod, "+book")
         }
         self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: retVal), callbackId: command.callbackId)
@@ -493,7 +493,6 @@
 */
     }
 
-    var VERSEKEY_BOOKABBREV = Int(org_crosswire_sword_SWModule_VERSEKEY_BOOKABBREV);
     var VERSEKEY_BOOK = Int(org_crosswire_sword_SWModule_VERSEKEY_BOOK);
     var VERSEKEY_CHAPTER = Int(org_crosswire_sword_SWModule_VERSEKEY_CHAPTER);
     var VERSEKEY_VERSE = Int(org_crosswire_sword_SWModule_VERSEKEY_VERSE);
@@ -503,7 +502,8 @@
     var VERSEKEY_VERSEMAX = Int(org_crosswire_sword_SWModule_VERSEKEY_VERSEMAX);
     var VERSEKEY_BOOKNAME = Int(org_crosswire_sword_SWModule_VERSEKEY_BOOKNAME);
     var VERSEKEY_SHORTTEXT = Int(org_crosswire_sword_SWModule_VERSEKEY_SHORTTEXT);
-    
+    var VERSEKEY_BOOKABBREV = Int(org_crosswire_sword_SWModule_VERSEKEY_BOOKABBREV);
+
     func renderChapter(masterMod: Int, mod: Int) -> [[String: Any]] {
         let saveMasterKey = String(cString: org_crosswire_sword_SWModule_getKeyText(masterMod))
         let saveKey = String(cString: org_crosswire_sword_SWModule_getKeyText(mod))