LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(fix) don't try to initialize location values when using single store mode

pull/208/head
Ludovic Marcotte 2016-05-13 11:14:28 -04:00
parent 32c6fa9757
commit 199a5f5215
1 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
SOPE/GDLContentStore/GCSFolderManager.m
View File

@ -436,32 +436,38 @@ static BOOL _singleStoreMode = NO;
folderId = [_record objectForKey:@"c_folder_id"];
folderName = [_record objectForKey:@"c_path"];
path = [self pathFromInternalName:folderName];
locationString = [_record objectForKey:@"c_location"];
location = [locationString isNotNull]
? [NSURL URLWithString:locationString]
: nil;
if (location == nil) {
[self logWithFormat:@"ERROR(%s): missing folder location in record: %@",
__PRETTY_FUNCTION__, _record];
return nil;
}
locationString = [_record objectForKey:@"c_quick_location"];
quickLocation = [locationString isNotNull]
? [NSURL URLWithString:locationString]
: nil;
if (quickLocation == nil) {
[self logWithFormat:@"WARNING(%s): missing quick location in record: %@",
__PRETTY_FUNCTION__, _record];
if (!_singleStoreMode) {
locationString = [_record objectForKey:@"c_location"];
location = [locationString isNotNull]
? [NSURL URLWithString:locationString]
: nil;
if (location == nil) {
[self logWithFormat:@"ERROR(%s): missing folder location in record: %@",
__PRETTY_FUNCTION__, _record];
return nil;
}
locationString = [_record objectForKey:@"c_quick_location"];
quickLocation = [locationString isNotNull]
? [NSURL URLWithString:locationString]
: nil;
if (quickLocation == nil) {
[self logWithFormat:@"WARNING(%s): missing quick location in record: %@",
__PRETTY_FUNCTION__, _record];
}
locationString = [_record objectForKey:@"c_acl_location"];
acl_location = [locationString isNotNull]
? [NSURL URLWithString:locationString]
: nil;
} else {
location = nil;
quickLocation = nil;
acl_location = nil;
}
locationString = [_record objectForKey:@"c_acl_location"];
acl_location = [locationString isNotNull]
? [NSURL URLWithString:locationString]
: nil;
folder = [[GCSFolder alloc] initWithPath:path primaryKey:folderId
folderTypeName:folderTypeName
folderType:folderType