Monotone-Parent: e273e1fc79bb27da2ab8838b78616c5fb161fd58
Monotone-Revision: 9fdb601e5aa4a2aafb9385ddc6c395ea29630d7c Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-09-01T13:21:27 Monotone-Branch: ca.inverse.sogomaint-2.0.2
Wolfgang Sourdeau
parent
344d0e00b3
commit
b53a8118e7
|
|
@ -1,190 +1,3 @@
|
|||
Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
|
||||
===================================================================
|
||||
--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (révision 1626)
|
||||
+++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (copie de travail)
|
||||
@@ -713,6 +713,39 @@
|
||||
return ms;
|
||||
}
|
||||
|
||||
+/* GCSEOAdaptorChannel protocol */
|
||||
+static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n" \
|
||||
+ @" c_name VARCHAR (256) NOT NULL PRIMARY KEY,\n"
|
||||
+ @" c_content VARCHAR (100000) NOT NULL,\n"
|
||||
+ @" c_creationdate INT4 NOT NULL,\n"
|
||||
+ @" c_lastmodified INT4 NOT NULL,\n"
|
||||
+ @" c_version INT4 NOT NULL,\n"
|
||||
+ @" c_deleted INT4 NULL\n"
|
||||
+ @")");
|
||||
+static NSString *sqlFolderACLFormat = (@"CREATE TABLE %@ (\n" \
|
||||
+ @" c_uid VARCHAR (256) NOT NULL,\n"
|
||||
+ @" c_object VARCHAR (256) NOT NULL,\n"
|
||||
+ @" c_role VARCHAR (80) NOT NULL\n"
|
||||
+ @")");
|
||||
+
|
||||
+- (NSException *) createGCSFolderTableWithName: (NSString *) tableName
|
||||
+{
|
||||
+ NSString *sql;
|
||||
+
|
||||
+ sql = [NSString stringWithFormat: sqlFolderFormat, tableName];
|
||||
+
|
||||
+ return [self evaluateExpressionX: sql];
|
||||
+}
|
||||
+
|
||||
+- (NSException *) createGCSFolderACLTableWithName: (NSString *) tableName
|
||||
+{
|
||||
+ NSString *sql;
|
||||
+
|
||||
+ sql = [NSString stringWithFormat: sqlFolderACLFormat, tableName];
|
||||
+
|
||||
+ return [self evaluateExpressionX: sql];
|
||||
+}
|
||||
+
|
||||
@end /* PostgreSQL72Channel */
|
||||
|
||||
@implementation PostgreSQL72Channel(PrimaryKeyGeneration)
|
||||
Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m
|
||||
===================================================================
|
||||
--- sope-gdl1/Oracle8/OracleAdaptorChannel.m (révision 1626)
|
||||
+++ sope-gdl1/Oracle8/OracleAdaptorChannel.m (copie de travail)
|
||||
@@ -30,6 +30,7 @@
|
||||
|
||||
#import <NGExtensions/NSObject+Logs.h>
|
||||
|
||||
+static BOOL debugOn = NO;
|
||||
//
|
||||
//
|
||||
//
|
||||
@@ -41,10 +42,19 @@
|
||||
|
||||
@implementation OracleAdaptorChannel (Private)
|
||||
|
||||
-- (void) _cleanup
|
||||
++ (void) initialize
|
||||
{
|
||||
+ NSUserDefaults *ud;
|
||||
+
|
||||
+ ud = [NSUserDefaults standardUserDefaults];
|
||||
+ debugOn = [ud boolForKey: @"OracleAdaptorDebug"];
|
||||
+}
|
||||
+
|
||||
+- (void) _cleanup
|
||||
+{
|
||||
column_info *info;
|
||||
int c;
|
||||
+ sword result;
|
||||
|
||||
[_resultSetProperties removeAllObjects];
|
||||
|
||||
@@ -58,11 +68,29 @@
|
||||
// so we just free the value instead.
|
||||
if (info->value)
|
||||
{
|
||||
- if (OCIDescriptorFree((dvoid *)info->value, (ub4)OCI_DTYPE_LOB) != OCI_SUCCESS)
|
||||
+ if (info->type == SQLT_CLOB
|
||||
+ || info->type == SQLT_BLOB
|
||||
+ || info->type == SQLT_BFILEE
|
||||
+ || info->type == SQLT_CFILEE)
|
||||
+ {
|
||||
+ result = OCIDescriptorFree((dvoid *)info->value, (ub4) OCI_DTYPE_LOB);
|
||||
+ if (result != OCI_SUCCESS)
|
||||
+ {
|
||||
+ NSLog (@"value was not a LOB descriptor");
|
||||
+ abort();
|
||||
+ }
|
||||
+ }
|
||||
+ else
|
||||
free(info->value);
|
||||
info->value = NULL;
|
||||
}
|
||||
- free(info);
|
||||
+ else
|
||||
+ {
|
||||
+ NSLog (@"trying to free an already freed value!");
|
||||
+ abort();
|
||||
+ }
|
||||
+ free(info);
|
||||
+
|
||||
[_row_buffer removeObjectAtIndex: c];
|
||||
}
|
||||
|
||||
@@ -231,6 +259,9 @@
|
||||
|
||||
[self _cleanup];
|
||||
|
||||
+ if (debugOn)
|
||||
+ [self logWithFormat: @"expression: %@", theExpression];
|
||||
+
|
||||
if (!theExpression || ![theExpression length])
|
||||
{
|
||||
[NSException raise: @"OracleInvalidExpressionException"
|
||||
@@ -302,7 +333,9 @@
|
||||
// We read the maximum width of a column
|
||||
info->max_width = 0;
|
||||
status = OCIAttrGet((dvoid*)param, (ub4)OCI_DTYPE_PARAM, (dvoid*)&(info->max_width), (ub4 *)0, (ub4)OCI_ATTR_DATA_SIZE, (OCIError *)_oci_err);
|
||||
-
|
||||
+
|
||||
+ if (debugOn)
|
||||
+ NSLog(@"name: %s, type: %d", cname, info->type);
|
||||
attribute = [EOAttribute attributeWithOracleType: info->type name: cname length: clen width: info->max_width];
|
||||
[_resultSetProperties addObject: attribute];
|
||||
|
||||
@@ -609,7 +642,7 @@
|
||||
|
||||
/* GCSEOAdaptorChannel protocol */
|
||||
static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n" \
|
||||
- @" c_name VARCHAR2 (256) NOT NULL,\n"
|
||||
+ @" c_name VARCHAR2 (256) NOT NULL PRIMARY KEY,\n"
|
||||
@" c_content CLOB NOT NULL,\n"
|
||||
@" c_creationdate INTEGER NOT NULL,\n"
|
||||
@" c_lastmodified INTEGER NOT NULL,\n"
|
||||
Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m
|
||||
===================================================================
|
||||
--- sope-gdl1/Oracle8/OracleAdaptorChannelController.m (révision 1626)
|
||||
+++ sope-gdl1/Oracle8/OracleAdaptorChannelController.m (copie de travail)
|
||||
@@ -31,6 +31,8 @@
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <GDLAccess/EOSQLExpression.h>
|
||||
|
||||
+static BOOL debugOn = NO;
|
||||
+
|
||||
//
|
||||
//
|
||||
//
|
||||
@@ -48,6 +50,14 @@
|
||||
//
|
||||
@implementation OracleAdaptorChannelController
|
||||
|
||||
++ (void) initialize
|
||||
+{
|
||||
+ NSUserDefaults *ud;
|
||||
+
|
||||
+ ud = [NSUserDefaults standardUserDefaults];
|
||||
+ debugOn = [ud boolForKey: @"OracleAdaptorDebug"];
|
||||
+}
|
||||
+
|
||||
- (EODelegateResponse) adaptorChannel: (id) theChannel
|
||||
willInsertRow: (NSMutableDictionary *) theRow
|
||||
forEntity: (EOEntity *) theEntity
|
||||
@@ -56,7 +66,8 @@
|
||||
NSArray *keys;
|
||||
int i, c;
|
||||
|
||||
- NSLog(@"willInsertRow: %@ %@", [theRow description], [theEntity description]);
|
||||
+ if (debugOn)
|
||||
+ NSLog(@"willInsertRow: %@ %@", [theRow description], [theEntity description]);
|
||||
|
||||
s = AUTORELEASE([[NSMutableString alloc] init]);
|
||||
|
||||
@@ -101,7 +112,8 @@
|
||||
NSArray *keys;
|
||||
int i, c;
|
||||
|
||||
- NSLog(@"willUpdatetRow: %@ %@", [theRow description], [theQualifier description]);
|
||||
+ if (debugOn)
|
||||
+ NSLog(@"willUpdateRow: %@ %@", [theRow description], [theQualifier description]);
|
||||
|
||||
s = AUTORELEASE([[NSMutableString alloc] init]);
|
||||
|
||||
Index: sope-mime/NGImap4/NGImap4Client.h
|
||||
===================================================================
|
||||
--- sope-mime/NGImap4/NGImap4Client.h (révision 1626)
|
||||
|
|
@ -776,6 +589,46 @@ Index: sope-mime/NGImap4/ChangeLog
|
|||
2007-08-24 Wolfgang Sourdeau <WSourdeau@Inverse.CA>
|
||||
|
||||
* NGImap4Connection.m: some fix for folders ending with a slash (OGo
|
||||
Index: sope-mime/NGImap4/NGImap4ConnectionManager.m
|
||||
===================================================================
|
||||
--- sope-mime/NGImap4/NGImap4ConnectionManager.m (révision 1626)
|
||||
+++ sope-mime/NGImap4/NGImap4ConnectionManager.m (copie de travail)
|
||||
@@ -38,6 +38,9 @@
|
||||
debugCache = [ud boolForKey:@"NGImap4EnableIMAP4CacheDebug"];
|
||||
poolingOff = [ud boolForKey:@"NGImap4DisableIMAP4Pooling"];
|
||||
|
||||
+ if ([ud objectForKey:@"NGImap4PoolingCleanupInterval"])
|
||||
+ PoolScanInterval = [[ud objectForKey:@"NGImap4PoolingCleanupInterval"] doubleValue];
|
||||
+
|
||||
if (debugOn) NSLog(@"Note: NGImap4EnableIMAP4Debug is enabled!");
|
||||
if (poolingOff) NSLog(@"WARNING: IMAP4 connection pooling is disabled!");
|
||||
}
|
||||
@@ -91,6 +94,25 @@
|
||||
|
||||
- (void)_garbageCollect:(NSTimer *)_timer {
|
||||
// TODO: scan for old IMAP4 channels
|
||||
+ NGImap4Connection *entry;
|
||||
+ NSDate *now;
|
||||
+ NSArray *a;
|
||||
+ int i;
|
||||
+
|
||||
+ a = [self->urlToEntry allKeys];
|
||||
+ now = [NSDate date];
|
||||
+
|
||||
+ for (i = 0; i < [a count]; i++)
|
||||
+ {
|
||||
+ entry = [self->urlToEntry objectForKey: [a objectAtIndex: i]];
|
||||
+
|
||||
+ if ([now timeIntervalSinceDate: [entry creationTime]] > PoolScanInterval)
|
||||
+ {
|
||||
+ [[entry client] logout];
|
||||
+ [self->urlToEntry removeObjectForKey: [a objectAtIndex: i]];
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
[self debugWithFormat:@"should collect IMAP4 channels (%d active)",
|
||||
[self->urlToEntry count]];
|
||||
}
|
||||
Index: sope-mime/NGMail/NGSmtpClient.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMail/NGSmtpClient.m (révision 1626)
|
||||
|
|
@ -1924,6 +1777,193 @@ Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m
|
|||
}
|
||||
return data;
|
||||
}
|
||||
Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
|
||||
===================================================================
|
||||
--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (révision 1626)
|
||||
+++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (copie de travail)
|
||||
@@ -713,6 +713,39 @@
|
||||
return ms;
|
||||
}
|
||||
|
||||
+/* GCSEOAdaptorChannel protocol */
|
||||
+static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n" \
|
||||
+ @" c_name VARCHAR (256) NOT NULL PRIMARY KEY,\n"
|
||||
+ @" c_content VARCHAR (100000) NOT NULL,\n"
|
||||
+ @" c_creationdate INT4 NOT NULL,\n"
|
||||
+ @" c_lastmodified INT4 NOT NULL,\n"
|
||||
+ @" c_version INT4 NOT NULL,\n"
|
||||
+ @" c_deleted INT4 NULL\n"
|
||||
+ @")");
|
||||
+static NSString *sqlFolderACLFormat = (@"CREATE TABLE %@ (\n" \
|
||||
+ @" c_uid VARCHAR (256) NOT NULL,\n"
|
||||
+ @" c_object VARCHAR (256) NOT NULL,\n"
|
||||
+ @" c_role VARCHAR (80) NOT NULL\n"
|
||||
+ @")");
|
||||
+
|
||||
+- (NSException *) createGCSFolderTableWithName: (NSString *) tableName
|
||||
+{
|
||||
+ NSString *sql;
|
||||
+
|
||||
+ sql = [NSString stringWithFormat: sqlFolderFormat, tableName];
|
||||
+
|
||||
+ return [self evaluateExpressionX: sql];
|
||||
+}
|
||||
+
|
||||
+- (NSException *) createGCSFolderACLTableWithName: (NSString *) tableName
|
||||
+{
|
||||
+ NSString *sql;
|
||||
+
|
||||
+ sql = [NSString stringWithFormat: sqlFolderACLFormat, tableName];
|
||||
+
|
||||
+ return [self evaluateExpressionX: sql];
|
||||
+}
|
||||
+
|
||||
@end /* PostgreSQL72Channel */
|
||||
|
||||
@implementation PostgreSQL72Channel(PrimaryKeyGeneration)
|
||||
Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m
|
||||
===================================================================
|
||||
--- sope-gdl1/Oracle8/OracleAdaptorChannel.m (révision 1626)
|
||||
+++ sope-gdl1/Oracle8/OracleAdaptorChannel.m (copie de travail)
|
||||
@@ -30,6 +30,7 @@
|
||||
|
||||
#import <NGExtensions/NSObject+Logs.h>
|
||||
|
||||
+static BOOL debugOn = NO;
|
||||
//
|
||||
//
|
||||
//
|
||||
@@ -41,10 +42,19 @@
|
||||
|
||||
@implementation OracleAdaptorChannel (Private)
|
||||
|
||||
-- (void) _cleanup
|
||||
++ (void) initialize
|
||||
{
|
||||
+ NSUserDefaults *ud;
|
||||
+
|
||||
+ ud = [NSUserDefaults standardUserDefaults];
|
||||
+ debugOn = [ud boolForKey: @"OracleAdaptorDebug"];
|
||||
+}
|
||||
+
|
||||
+- (void) _cleanup
|
||||
+{
|
||||
column_info *info;
|
||||
int c;
|
||||
+ sword result;
|
||||
|
||||
[_resultSetProperties removeAllObjects];
|
||||
|
||||
@@ -58,11 +68,29 @@
|
||||
// so we just free the value instead.
|
||||
if (info->value)
|
||||
{
|
||||
- if (OCIDescriptorFree((dvoid *)info->value, (ub4)OCI_DTYPE_LOB) != OCI_SUCCESS)
|
||||
+ if (info->type == SQLT_CLOB
|
||||
+ || info->type == SQLT_BLOB
|
||||
+ || info->type == SQLT_BFILEE
|
||||
+ || info->type == SQLT_CFILEE)
|
||||
+ {
|
||||
+ result = OCIDescriptorFree((dvoid *)info->value, (ub4) OCI_DTYPE_LOB);
|
||||
+ if (result != OCI_SUCCESS)
|
||||
+ {
|
||||
+ NSLog (@"value was not a LOB descriptor");
|
||||
+ abort();
|
||||
+ }
|
||||
+ }
|
||||
+ else
|
||||
free(info->value);
|
||||
info->value = NULL;
|
||||
}
|
||||
- free(info);
|
||||
+ else
|
||||
+ {
|
||||
+ NSLog (@"trying to free an already freed value!");
|
||||
+ abort();
|
||||
+ }
|
||||
+ free(info);
|
||||
+
|
||||
[_row_buffer removeObjectAtIndex: c];
|
||||
}
|
||||
|
||||
@@ -231,6 +259,9 @@
|
||||
|
||||
[self _cleanup];
|
||||
|
||||
+ if (debugOn)
|
||||
+ [self logWithFormat: @"expression: %@", theExpression];
|
||||
+
|
||||
if (!theExpression || ![theExpression length])
|
||||
{
|
||||
[NSException raise: @"OracleInvalidExpressionException"
|
||||
@@ -302,7 +333,9 @@
|
||||
// We read the maximum width of a column
|
||||
info->max_width = 0;
|
||||
status = OCIAttrGet((dvoid*)param, (ub4)OCI_DTYPE_PARAM, (dvoid*)&(info->max_width), (ub4 *)0, (ub4)OCI_ATTR_DATA_SIZE, (OCIError *)_oci_err);
|
||||
-
|
||||
+
|
||||
+ if (debugOn)
|
||||
+ NSLog(@"name: %s, type: %d", cname, info->type);
|
||||
attribute = [EOAttribute attributeWithOracleType: info->type name: cname length: clen width: info->max_width];
|
||||
[_resultSetProperties addObject: attribute];
|
||||
|
||||
@@ -609,7 +642,7 @@
|
||||
|
||||
/* GCSEOAdaptorChannel protocol */
|
||||
static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n" \
|
||||
- @" c_name VARCHAR2 (256) NOT NULL,\n"
|
||||
+ @" c_name VARCHAR2 (256) NOT NULL PRIMARY KEY,\n"
|
||||
@" c_content CLOB NOT NULL,\n"
|
||||
@" c_creationdate INTEGER NOT NULL,\n"
|
||||
@" c_lastmodified INTEGER NOT NULL,\n"
|
||||
Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m
|
||||
===================================================================
|
||||
--- sope-gdl1/Oracle8/OracleAdaptorChannelController.m (révision 1626)
|
||||
+++ sope-gdl1/Oracle8/OracleAdaptorChannelController.m (copie de travail)
|
||||
@@ -31,6 +31,8 @@
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <GDLAccess/EOSQLExpression.h>
|
||||
|
||||
+static BOOL debugOn = NO;
|
||||
+
|
||||
//
|
||||
//
|
||||
//
|
||||
@@ -48,6 +50,14 @@
|
||||
//
|
||||
@implementation OracleAdaptorChannelController
|
||||
|
||||
++ (void) initialize
|
||||
+{
|
||||
+ NSUserDefaults *ud;
|
||||
+
|
||||
+ ud = [NSUserDefaults standardUserDefaults];
|
||||
+ debugOn = [ud boolForKey: @"OracleAdaptorDebug"];
|
||||
+}
|
||||
+
|
||||
- (EODelegateResponse) adaptorChannel: (id) theChannel
|
||||
willInsertRow: (NSMutableDictionary *) theRow
|
||||
forEntity: (EOEntity *) theEntity
|
||||
@@ -56,7 +66,8 @@
|
||||
NSArray *keys;
|
||||
int i, c;
|
||||
|
||||
- NSLog(@"willInsertRow: %@ %@", [theRow description], [theEntity description]);
|
||||
+ if (debugOn)
|
||||
+ NSLog(@"willInsertRow: %@ %@", [theRow description], [theEntity description]);
|
||||
|
||||
s = AUTORELEASE([[NSMutableString alloc] init]);
|
||||
|
||||
@@ -101,7 +112,8 @@
|
||||
NSArray *keys;
|
||||
int i, c;
|
||||
|
||||
- NSLog(@"willUpdatetRow: %@ %@", [theRow description], [theQualifier description]);
|
||||
+ if (debugOn)
|
||||
+ NSLog(@"willUpdateRow: %@ %@", [theRow description], [theQualifier description]);
|
||||
|
||||
s = AUTORELEASE([[NSMutableString alloc] init]);
|
||||
|
||||
Index: sope-core/NGExtensions/NGExtensions/NSString+Ext.h
|
||||
===================================================================
|
||||
--- sope-core/NGExtensions/NGExtensions/NSString+Ext.h (révision 1626)
|
||||
|
|
@ -2363,6 +2403,19 @@ Index: sope-appserver/NGObjWeb/WOContext.m
|
|||
if ((serverURL = [rq headerForKey:@"x-webobjects-server-url"]) == nil) {
|
||||
if ((host = [rq headerForKey:@"host"]))
|
||||
serverURL = [@"http://" stringByAppendingString:host];
|
||||
Index: sope-appserver/NGObjWeb/ChangeLog
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/ChangeLog (révision 1626)
|
||||
+++ sope-appserver/NGObjWeb/ChangeLog (copie de travail)
|
||||
@@ -1,3 +1,8 @@
|
||||
+2008-09-01 Ludovic Marcotte <lmarcotte@inverse.ca>
|
||||
+
|
||||
+ * WORequest.m ([WORequest -browserLanguages]): we ensure
|
||||
+ "language" never is an empty string, otherwise we ignore it.
|
||||
+
|
||||
2008-05-21 Sebastian Reitenbach <reitenbach@rapideye.de>
|
||||
|
||||
* WOHTTPURLHandle.m: add 'query' component of URL to request path
|
||||
Index: sope-appserver/NGObjWeb/DAVPropMap.plist
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/DAVPropMap.plist (révision 1626)
|
||||
|
|
@ -2842,6 +2895,19 @@ Index: sope-appserver/NGObjWeb/Defaults.plist
|
|||
PROPFIND,
|
||||
PROPPATCH,
|
||||
DELETE,
|
||||
Index: sope-appserver/NGObjWeb/WORequest.m
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/WORequest.m (révision 1626)
|
||||
+++ sope-appserver/NGObjWeb/WORequest.m (copie de travail)
|
||||
@@ -597,6 +597,8 @@
|
||||
if (r.length > 0)
|
||||
language = [language substringToIndex:r.location];
|
||||
language = [language stringByTrimmingSpaces];
|
||||
+
|
||||
+ if (![language length]) continue;
|
||||
|
||||
/* check in map */
|
||||
if ((tmp = [self languageForBrowserLanguageCode:language]))
|
||||
Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (révision 1626)
|
||||
|
|
|
|||
Loading…
Reference in New Issue