[sword-svn] r2590 - in trunk/bindings/objc: ObjCSword.xcodeproj build_sword src

[mdbergmann at crosswire.org]

Author: mdbergmann
Date: 2010-11-21 09:14:35 -0700 (Sun, 21 Nov 2010)
New Revision: 2590

Modified:
   trunk/bindings/objc/ObjCSword.xcodeproj/project.pbxproj
   trunk/bindings/objc/build_sword/build_mac_sword.sh
   trunk/bindings/objc/src/SwordManager.mm
Log:
module names are stored as lower case string in SwordManagers module cache. -moduleForName: now als uses a lower case string to pull the module from the cache.

Modified: trunk/bindings/objc/ObjCSword.xcodeproj/project.pbxproj
===================================================================
--- trunk/bindings/objc/ObjCSword.xcodeproj/project.pbxproj	2010-11-06 17:53:46 UTC (rev 2589)
+++ trunk/bindings/objc/ObjCSword.xcodeproj/project.pbxproj	2010-11-21 16:14:35 UTC (rev 2590)
@@ -2524,7 +2524,14 @@
 			isa = PBXProject;
 			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "ObjCSword" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 0867D691FE84028FC02AAC07 /* ObjCSword */;
 			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
 			projectDirPath = "";

Modified: trunk/bindings/objc/build_sword/build_mac_sword.sh
===================================================================
--- trunk/bindings/objc/build_sword/build_mac_sword.sh	2010-11-06 17:53:46 UTC (rev 2589)
+++ trunk/bindings/objc/build_sword/build_mac_sword.sh	2010-11-21 16:14:35 UTC (rev 2590)
@@ -3,7 +3,7 @@
 #
 
 APP=sword
-VERS=1.6.1
+VERS=1.6.2
 BDIR=`pwd`
 
 DEBUG=0
@@ -13,9 +13,9 @@
 
 SWORDPATH="$BDIR/../../../"
 ICUPATH="$BDIR/../dependencies/icu"
-PPCCLUCENEPATH="$BDIR/../clucene_build/build/ppc_inst"
-INTELCLUCENEPATH="$BDIR/../clucene_build/build/intel_inst"
-INTEL64CLUCENEPATH="$BDIR/../clucene_build/build/intel64_inst"
+PPCCLUCENEPATH="$BDIR/../build_clucene/build/ppc_inst"
+INTELCLUCENEPATH="$BDIR/../build_clucene/build/intel_inst"
+INTEL64CLUCENEPATH="$BDIR/../build_clucene/build/intel64_inst"
 
 # check commandline
 for arg in "$@" 

Modified: trunk/bindings/objc/src/SwordManager.mm
===================================================================
--- trunk/bindings/objc/src/SwordManager.mm	2010-11-06 17:53:46 UTC (rev 2589)
+++ trunk/bindings/objc/src/SwordManager.mm	2010-11-21 16:14:35 UTC (rev 2590)
@@ -56,9 +56,9 @@
             
             ModuleType aType = [SwordModule moduleTypeForModuleTypeString:type];
             SwordModule *sm = [SwordModule moduleForType:aType andName:name swModule:mod swordManager:self];
-            [dict setObject:sm forKey:[sm name]];
-            
-            [self addFiltersToModule:mod];            
+            [dict setObject:sm forKey:[[sm name] lowercaseString]];
+
+            [self addFiltersToModule:mod];
         }
 	}
     
@@ -319,7 +319,7 @@
 
 - (SwordModule *)moduleWithName:(NSString *)name {
     
-	SwordModule	*ret = [modules objectForKey:name];
+	SwordModule	*ret = [modules objectForKey:[name lowercaseString]];
     if(ret == nil) {
         sword::SWModule *mod = [self getSWModuleWithName:name];
         if(mod == NULL) {
@@ -334,7 +334,7 @@
 
             if(ret != nil) {
                 NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithDictionary:modules];
-                [dict setObject:ret forKey:name];
+                [dict setObject:ret forKey:[name lowercaseString]];
                 self.modules = dict;                
             }
         }