[sword-svn] r2552 - trunk/bindings/objc/src

[mdbergmann at crosswire.org]

Author: mdbergmann
Date: 2010-09-21 01:57:53 -0700 (Tue, 21 Sep 2010)
New Revision: 2552

Modified:
   trunk/bindings/objc/src/SwordBible.mm
   trunk/bindings/objc/src/SwordModule.mm
Log:
module itself has no versification and returns now an empty string. bible and subclasses will return proper versifications strings.

Modified: trunk/bindings/objc/src/SwordBible.mm
===================================================================
--- trunk/bindings/objc/src/SwordBible.mm	2010-09-14 11:03:02 UTC (rev 2551)
+++ trunk/bindings/objc/src/SwordBible.mm	2010-09-21 08:57:53 UTC (rev 2552)
@@ -365,6 +365,24 @@
     return ret;
 }
 
+- (NSString *)versification {
+    NSString *versification = [configEntries objectForKey:SWMOD_CONFENTRY_VERSIFICATION];
+    if(versification == nil) {
+        versification = [self configFileEntryForConfigKey:SWMOD_CONFENTRY_VERSIFICATION];
+        if(versification != nil) {
+            [configEntries setObject:versification forKey:SWMOD_CONFENTRY_VERSIFICATION];
+        }
+    }
+    
+    // if still nil, use KJV versification
+    if(versification == nil) {
+        versification = @"KJV";
+        [configEntries setObject:versification forKey:SWMOD_CONFENTRY_VERSIFICATION];
+    }
+    
+    return versification;    
+}
+
 #pragma mark - SwordModuleAccess
 
 - (id)createKey {

Modified: trunk/bindings/objc/src/SwordModule.mm
===================================================================
--- trunk/bindings/objc/src/SwordModule.mm	2010-09-14 11:03:02 UTC (rev 2551)
+++ trunk/bindings/objc/src/SwordModule.mm	2010-09-21 08:57:53 UTC (rev 2552)
@@ -329,22 +329,9 @@
     return aboutText;    
 }
 
+/** this is only relevant for bible and commentaries */
 - (NSString *)versification {
-    NSString *versification = [configEntries objectForKey:SWMOD_CONFENTRY_VERSIFICATION];
-    if(versification == nil) {
-        versification = [self configFileEntryForConfigKey:SWMOD_CONFENTRY_VERSIFICATION];
-        if(versification != nil) {
-            [configEntries setObject:versification forKey:SWMOD_CONFENTRY_VERSIFICATION];
-        }
-    }
-    
-    // if still nil, use KJV versification
-    if(versification == nil) {
-        versification = @"KJV";
-        [configEntries setObject:versification forKey:SWMOD_CONFENTRY_VERSIFICATION];
-    }
-    
-    return versification;
+    return @"";
 }
 
 - (BOOL)isEditable {