amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-23 20:35:24 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 23bc0dfd83428726c3d32139c369a2635bca5566

Browse Source 
Monotone-Revision: 4f12ba210dcd4149e7496ee80e06c65b94793dd3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-01T12:25:21
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-11-01 12:25:21 +00:00
parent 8bc00a5cf2
commit 891ab5f97a
2 changed files with 59 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+14
View File
@@ -1,3 +1,17 @@
2007-11-01 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/AgenorUserDefaults.m ([AgenorUserDefaults
-primaryFetchProfile]): make use of -[NSPropertyListSerialization
propertyListFromData:mutabilityOption:format:errorDescription:] to
deserialize the plist. Removed variant for libFoundation since it
should support the above.
([AgenorUserDefaults -generateSQLForInsert])
([AgenorUserDefaults -generateSQLForUpdate]): make use of
-[NSPropertyListSerialization
dataFromPropertyList:format:errorDescription:] to serialize the
plist. Removed variant for libFoundation since it should support
the above. Escape the backslashes from the resulting string.
2007-10-31 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Mailer/SOGoMailFolder.[hm]: added a new subclass of
SoObjects/SOGo/AgenorUserDefaults.m
+45 -81
View File
@@ -113,12 +113,10 @@ static NSString *uidColumnName = @"c_uid";
EOAdaptorChannel *channel;
NSDictionary *row;
NSException *ex;
NSString *sql, *value;
NSString *sql, *value, *error;
NSArray *attrs;
BOOL rc;
#if LIB_FOUNDATION_LIBRARY
NSData *plistData;
#endif
rc = NO;
@@ -134,7 +132,6 @@ static NSString *uidColumnName = @"c_uid";
uidColumnName, [self uid]];
[values release];
values = [NSMutableDictionary new];
/* run SQL */
@@ -155,15 +152,13 @@ static NSString *uidColumnName = @"c_uid";
value = [row objectForKey: fieldName];
if ([value isNotNull])
{
#if LIB_FOUNDATION_LIBRARY
plistData = [value dataUsingEncoding: NSUTF8StringEncoding];
[values setDictionary: [NSDeserializer
deserializePropertyListFromData: plistData
mutableContainers: YES]];
#else
[values setDictionary: [value propertyList]];
#endif
values
= [NSPropertyListSerialization propertyListFromData: plistData
mutabilityOption: NSPropertyListMutableContainers
format: NULL
errorDescription: &error];
[values retain];
}
ASSIGN (lastFetch, [NSCalendarDate date]);
@@ -180,22 +175,9 @@ static NSString *uidColumnName = @"c_uid";
return rc;
}
- (NSString *) generateSQLForInsert
- (NSString *) _serializedDefaults
{
NSMutableString *sql;
NSString *serializedDefaults;
#if LIB_FOUNDATION_LIBRARY
serializedDefaults = [values stringRepresentation];
sql = [NSString stringWithFormat: (@"INSERT INTO %@"
@" (%@, %@)"
@" VALUES ('%@', '%@')"),
[[self tableURL] gcsTableName], uidColumnName, fieldName,
[self uid],
[serializedDefaults stringByReplacingString: @"'"
withString:@"''"]];
#else
NSMutableString *serializedDefaults;
NSData *serializedDefaultsData;
NSString *error;
@@ -204,75 +186,57 @@ static NSString *uidColumnName = @"c_uid";
= [NSPropertyListSerialization dataFromPropertyList: values
format: NSPropertyListOpenStepFormat
errorDescription: &error];
if (error)
{
sql = nil;
[self errorWithFormat: @"serializing the defaults: %@", error];
serializedDefaults = nil;
[error release];
}
else
{
serializedDefaults = [[NSString alloc] initWithData: serializedDefaultsData
encoding: NSUTF8StringEncoding];
sql = [NSString stringWithFormat: (@"INSERT INTO %@"
@" (%@, %@)"
@" VALUES ('%@', '%@')"),
[[self tableURL] gcsTableName], uidColumnName, fieldName,
[self uid],
[serializedDefaults stringByReplacingString:@"'" withString:@"''"]];
[serializedDefaults release];
serializedDefaults
= [[NSMutableString alloc] initWithData: serializedDefaultsData
encoding: NSUTF8StringEncoding];
[serializedDefaults autorelease];
[serializedDefaults replaceString: @"\\" withString: @"\\\\"];
[serializedDefaults replaceString: @"'" withString: @"''"];
}
#endif
return serializedDefaults;
}
- (NSString *) generateSQLForInsert
{
NSString *sql, *serializedDefaults;
serializedDefaults = [self _serializedDefaults];
if (serializedDefaults)
sql = [NSString stringWithFormat: (@"INSERT INTO %@"
@" (%@, %@)"
@" VALUES ('%@', '%@')"),
[[self tableURL] gcsTableName], uidColumnName, fieldName,
[self uid], serializedDefaults];
else
sql = nil;
return sql;
}
- (NSString *) generateSQLForUpdate
{
NSMutableString *sql;
NSString *serializedDefaults;
NSString *sql, *serializedDefaults;
#if LIB_FOUNDATION_LIBRARY
serializedDefaults = [values stringRepresentation];
sql = [NSString stringWithFormat: (@"UPDATE %@"
@" SET %@ = '%@'"
@" WHERE %@ = '%@'"),
[[self tableURL] gcsTableName],
fieldName,
[serializedDefaults stringByReplacingString:@"'" withString:@"''"],
uidColumnName, [self uid]];
#else
NSData *serializedDefaultsData;
NSString *error;
error = nil;
serializedDefaultsData
= [NSPropertyListSerialization dataFromPropertyList: values
format: NSPropertyListOpenStepFormat
errorDescription: &error];
if (error)
{
sql = nil;
[error release];
}
serializedDefaults = [self _serializedDefaults];
if (serializedDefaults)
sql = [NSString stringWithFormat: (@"UPDATE %@"
@" SET %@ = '%@'"
@" WHERE %@ = '%@'"),
[[self tableURL] gcsTableName],
fieldName,
serializedDefaults,
uidColumnName, [self uid]];
else
{
serializedDefaults = [[NSString alloc] initWithData: serializedDefaultsData
encoding: NSUTF8StringEncoding];
sql = [NSString stringWithFormat: (@"UPDATE %@"
@" SET %@ = '%@'"
@" WHERE %@ = '%@'"),
[[self tableURL] gcsTableName],
fieldName,
[serializedDefaults stringByReplacingString: @"'"
withString: @"''"],
uidColumnName, [self uid]];
[serializedDefaults release];
}
#endif
sql = nil;
return sql;
}