Made initializing an entity from a raw entity more robust

SVN: 27271

openbis-ipad/BisKit/Classes/CISDOBIpadEntity.m

@@ -89,15 +89,18 @@
 
 - (void)initializeFromRawEntity:(CISDOBIpadRawEntity *)rawEntity
 {
+    // These will always be non-nil
     self.permId = rawEntity.permId;
     self.refcon = rawEntity.refcon;
-    self.category = rawEntity.category;
-    self.summaryHeader = rawEntity.summaryHeader;
-    self.summary = rawEntity.summary;
-    self.childrenPermIdsJson = rawEntity.children;
-//    self.identifier = rawEntity.identifier;
-//    self.imageUrl = rawEntity.imageUrl;
-//    self.propertiesJson = rawEntity.properties;
+    
+    // Need to check if these values were transmitted with the raw entity
+    if (rawEntity.category) self.category = rawEntity.category;
+    if (rawEntity.summaryHeader) self.summaryHeader = rawEntity.summaryHeader;
+    if (rawEntity.summary) self.summary = rawEntity.summary;
+    if (rawEntity.children) self.childrenPermIdsJson = rawEntity.children;
+    if (rawEntity.identifier) self.identifier = rawEntity.identifier;
+    if (rawEntity.imageUrl) self.imageUrl = rawEntity.imageUrl;
+    if (rawEntity.properties) self.propertiesJson = rawEntity.properties;
 }
 
 @end

openbis-ipad/BisKit/Classes/CISDOBIpadService.m

@@ -211,7 +211,10 @@ NSString *const CISDOBIpadServiceErrorDomain = @"CISDOBIpadServiceErrorDomain";
 - (NSString *)stringContentValueAtName:(NSString *)name
 {
     // Look up the index in the map
-    NSUInteger index = [[_fieldMap objectForKey: name] unsignedIntegerValue];
+    NSNumber *indexHolder = [_fieldMap objectForKey: name];
+    // This value was not provided
+    if (!indexHolder) return nil;
+    NSUInteger index = [indexHolder unsignedIntegerValue];
     return [[_content objectAtIndex: index] objectForKey: @"value"];
 }