Monotone-Parent: 4237da1c46aa8fc93100964f3c0b79c40b83ea1b
Monotone-Revision: 0e8b32d9c70c2ce26b1625a032639e96a5e907a9 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-07-04T13:57:47 Monotone-Branch: ca.inverse.sogomaint-2.0.2
Wolfgang Sourdeau
parent
8d7bb2a170
commit
fc88f88fff
|
|
@ -1,193 +1,53 @@
|
|||
Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
|
||||
Index: sope-mime/NGImap4/NGImap4Client.m
|
||||
===================================================================
|
||||
--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (révision 1621)
|
||||
+++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (copie de travail)
|
||||
@@ -713,6 +713,39 @@
|
||||
return ms;
|
||||
--- sope-mime/NGImap4/NGImap4Client.m (révision 1623)
|
||||
+++ sope-mime/NGImap4/NGImap4Client.m (copie de travail)
|
||||
@@ -53,17 +53,17 @@
|
||||
|
||||
@end /* NGImap4Client(ConnectionRegistration); */
|
||||
|
||||
-#if GNUSTEP_BASE_LIBRARY
|
||||
-/* FIXME: TODO: move someplace better (hh: NGExtensions...) */
|
||||
-@implementation NSException(setUserInfo)
|
||||
+// #if GNUSTEP_BASE_LIBRARY
|
||||
+// /* FIXME: TODO: move someplace better (hh: NGExtensions...) */
|
||||
+// @implementation NSException(setUserInfo)
|
||||
|
||||
-- (id)setUserInfo:(NSDictionary *)_userInfo {
|
||||
- ASSIGN(self->_e_info, _userInfo);
|
||||
- return self;
|
||||
-}
|
||||
+// - (id)setUserInfo:(NSDictionary *)_userInfo {
|
||||
+// ASSIGN(self->_e_info, _userInfo);
|
||||
+// return self;
|
||||
+// }
|
||||
|
||||
-@end /* NSException(setUserInfo) */
|
||||
-#endif
|
||||
+// @end /* NSException(setUserInfo) */
|
||||
+// #endif
|
||||
|
||||
@interface NGImap4Client(Private)
|
||||
|
||||
@@ -967,11 +967,12 @@
|
||||
descr = @"Could not process qualifier for imap search ";
|
||||
descr = [descr stringByAppendingString:reason];
|
||||
|
||||
- exception = [[NGImap4SearchException alloc] initWithFormat:@"%@", descr];
|
||||
ui = [NSDictionary dictionaryWithObject:_q forKey:@"qualifier"];
|
||||
- [exception setUserInfo:ui];
|
||||
+ exception
|
||||
+ = [NGImap4SearchException exceptionWithName: @"NGImap4SearchException"
|
||||
+ reason: descr
|
||||
+ userInfo: ui];
|
||||
[self->context setLastException:exception];
|
||||
- [exception release];
|
||||
}
|
||||
|
||||
+/* 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 1621)
|
||||
+++ 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 1621)
|
||||
+++ 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]);
|
||||
|
||||
- (NSString *)_searchExprForQual:(EOQualifier *)_qualifier {
|
||||
Index: sope-mime/NGImap4/NGImap4Connection.m
|
||||
===================================================================
|
||||
--- sope-mime/NGImap4/NGImap4Connection.m (révision 1621)
|
||||
--- sope-mime/NGImap4/NGImap4Connection.m (révision 1623)
|
||||
+++ sope-mime/NGImap4/NGImap4Connection.m (copie de travail)
|
||||
@@ -381,7 +381,7 @@
|
||||
|
||||
|
|
@ -200,7 +60,7 @@ Index: sope-mime/NGImap4/NGImap4Connection.m
|
|||
[self errorWithFormat:@"Could not list mailbox hierarchy!"];
|
||||
Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m
|
||||
===================================================================
|
||||
--- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (révision 1621)
|
||||
--- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (révision 1623)
|
||||
+++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m (copie de travail)
|
||||
@@ -648,14 +648,13 @@
|
||||
enumerator = [_flags objectEnumerator];
|
||||
|
|
@ -226,7 +86,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m
|
|||
if (objs) free(objs);
|
||||
Index: sope-mime/NGImap4/NGImap4ResponseParser.m
|
||||
===================================================================
|
||||
--- sope-mime/NGImap4/NGImap4ResponseParser.m (révision 1621)
|
||||
--- sope-mime/NGImap4/NGImap4ResponseParser.m (révision 1623)
|
||||
+++ sope-mime/NGImap4/NGImap4ResponseParser.m (copie de travail)
|
||||
@@ -84,6 +84,8 @@
|
||||
static NSDictionary *_parseMultipartBody(NGImap4ResponseParser *self,
|
||||
|
|
@ -451,7 +311,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m
|
|||
{
|
||||
Index: sope-mime/NGMail/NGSmtpClient.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMail/NGSmtpClient.m (révision 1621)
|
||||
--- sope-mime/NGMail/NGSmtpClient.m (révision 1623)
|
||||
+++ sope-mime/NGMail/NGSmtpClient.m (copie de travail)
|
||||
@@ -24,6 +24,82 @@
|
||||
#include "NGSmtpReplyCodes.h"
|
||||
|
|
@ -607,7 +467,7 @@ Index: sope-mime/NGMail/NGSmtpClient.m
|
|||
reply = [self receiveReply];
|
||||
Index: sope-mime/NGMail/NGMailAddressParser.h
|
||||
===================================================================
|
||||
--- sope-mime/NGMail/NGMailAddressParser.h (révision 1621)
|
||||
--- sope-mime/NGMail/NGMailAddressParser.h (révision 1623)
|
||||
+++ sope-mime/NGMail/NGMailAddressParser.h (copie de travail)
|
||||
@@ -24,7 +24,9 @@
|
||||
|
||||
|
|
@ -645,7 +505,7 @@ Index: sope-mime/NGMail/NGMailAddressParser.h
|
|||
|
||||
Index: sope-mime/NGMail/NGMimeMessageGenerator.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMail/NGMimeMessageGenerator.m (révision 1621)
|
||||
--- sope-mime/NGMail/NGMimeMessageGenerator.m (révision 1623)
|
||||
+++ sope-mime/NGMail/NGMimeMessageGenerator.m (copie de travail)
|
||||
@@ -86,37 +86,40 @@
|
||||
char *des = NULL;
|
||||
|
|
@ -711,7 +571,7 @@ Index: sope-mime/NGMail/NGMimeMessageGenerator.m
|
|||
unsigned isoEndLen = 2;
|
||||
Index: sope-mime/NGMail/NGMailAddressParser.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMail/NGMailAddressParser.m (révision 1621)
|
||||
--- sope-mime/NGMail/NGMailAddressParser.m (révision 1623)
|
||||
+++ sope-mime/NGMail/NGMailAddressParser.m (copie de travail)
|
||||
@@ -52,9 +52,9 @@
|
||||
StrClass = [NSString class];
|
||||
|
|
@ -823,7 +683,7 @@ Index: sope-mime/NGMail/NGMailAddressParser.m
|
|||
self->dataPos = 0;
|
||||
Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (révision 1621)
|
||||
--- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (révision 1623)
|
||||
+++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (copie de travail)
|
||||
@@ -19,88 +19,45 @@
|
||||
02111-1307, USA.
|
||||
|
|
@ -1218,7 +1078,7 @@ Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m
|
|||
#if 0
|
||||
Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (révision 1621)
|
||||
--- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (révision 1623)
|
||||
+++ sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (copie de travail)
|
||||
@@ -77,6 +77,7 @@
|
||||
[rfc822Set setGenerator:gen forField:@"bcc"];
|
||||
|
|
@ -1230,7 +1090,7 @@ Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m
|
|||
|
||||
Index: sope-mime/NGMime/NGMimeBodyPart.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimeBodyPart.m (révision 1621)
|
||||
--- sope-mime/NGMime/NGMimeBodyPart.m (révision 1623)
|
||||
+++ sope-mime/NGMime/NGMimeBodyPart.m (copie de travail)
|
||||
@@ -31,18 +31,6 @@
|
||||
return 2;
|
||||
|
|
@ -1268,7 +1128,7 @@ Index: sope-mime/NGMime/NGMimeBodyPart.m
|
|||
- (NSString *)contentId {
|
||||
Index: sope-mime/NGMime/GNUmakefile.preamble
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/GNUmakefile.preamble (révision 1621)
|
||||
--- sope-mime/NGMime/GNUmakefile.preamble (révision 1623)
|
||||
+++ sope-mime/NGMime/GNUmakefile.preamble (copie de travail)
|
||||
@@ -5,6 +5,11 @@
|
||||
-DLIBRARY_MINOR_VERSION=${MINOR_VERSION} \
|
||||
|
|
@ -1284,7 +1144,7 @@ Index: sope-mime/NGMime/GNUmakefile.preamble
|
|||
-I../../sope-core/NGStreams/ \
|
||||
Index: sope-mime/NGMime/NGMimeBodyParser.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimeBodyParser.m (révision 1621)
|
||||
--- sope-mime/NGMime/NGMimeBodyParser.m (révision 1623)
|
||||
+++ sope-mime/NGMime/NGMimeBodyParser.m (copie de travail)
|
||||
@@ -67,7 +67,10 @@
|
||||
if (_data == nil) return nil;
|
||||
|
|
@ -1300,7 +1160,7 @@ Index: sope-mime/NGMime/NGMimeBodyParser.m
|
|||
|
||||
Index: sope-mime/NGMime/NGMimePartParser.h
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimePartParser.h (révision 1621)
|
||||
--- sope-mime/NGMime/NGMimePartParser.h (révision 1623)
|
||||
+++ sope-mime/NGMime/NGMimePartParser.h (copie de travail)
|
||||
@@ -117,6 +117,7 @@
|
||||
BOOL parserParseRawBodyDataOfPart:1;
|
||||
|
|
@ -1322,7 +1182,7 @@ Index: sope-mime/NGMime/NGMimePartParser.h
|
|||
@interface NSObject(NGMimePartParser)
|
||||
Index: sope-mime/NGMime/NGMimePartParser.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimePartParser.m (révision 1621)
|
||||
--- sope-mime/NGMime/NGMimePartParser.m (révision 1623)
|
||||
+++ sope-mime/NGMime/NGMimePartParser.m (copie de travail)
|
||||
@@ -227,7 +227,7 @@
|
||||
}
|
||||
|
|
@ -1347,7 +1207,7 @@ Index: sope-mime/NGMime/NGMimePartParser.m
|
|||
: [NGMimeType mimeType:[ctype stringValue]];
|
||||
Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (révision 1621)
|
||||
--- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (révision 1623)
|
||||
+++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (copie de travail)
|
||||
@@ -130,8 +130,13 @@
|
||||
|
||||
|
|
@ -1378,7 +1238,7 @@ Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m
|
|||
bufLen = [data length];
|
||||
Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (révision 1621)
|
||||
--- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (révision 1623)
|
||||
+++ sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (copie de travail)
|
||||
@@ -49,80 +49,70 @@
|
||||
|
||||
|
|
@ -1512,9 +1372,196 @@ Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m
|
|||
}
|
||||
return data;
|
||||
}
|
||||
Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
|
||||
===================================================================
|
||||
--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (révision 1623)
|
||||
+++ 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 1623)
|
||||
+++ 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 1623)
|
||||
+++ 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 1621)
|
||||
--- sope-core/NGExtensions/NGExtensions/NSString+Ext.h (révision 1623)
|
||||
+++ sope-core/NGExtensions/NGExtensions/NSString+Ext.h (copie de travail)
|
||||
@@ -30,6 +30,7 @@
|
||||
|
||||
|
|
@ -1552,7 +1599,7 @@ Index: sope-core/NGExtensions/NGExtensions/NSString+Ext.h
|
|||
/* specific to libFoundation */
|
||||
Index: sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m
|
||||
===================================================================
|
||||
--- sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (révision 1621)
|
||||
--- sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (révision 1623)
|
||||
+++ sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (copie de travail)
|
||||
@@ -39,18 +39,6 @@
|
||||
: (NSString *)[[self copy] autorelease];
|
||||
|
|
@ -1641,7 +1688,7 @@ Index: sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m
|
|||
- (BOOL)isAbsoluteURL
|
||||
Index: sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m
|
||||
===================================================================
|
||||
--- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (révision 1621)
|
||||
--- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (révision 1623)
|
||||
+++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (copie de travail)
|
||||
@@ -140,8 +140,12 @@
|
||||
|
||||
|
|
@ -1684,7 +1731,7 @@ Index: sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m
|
|||
static char *iconv_wrapper(id self, char *_src, unsigned _srcLen,
|
||||
Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m
|
||||
===================================================================
|
||||
--- sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (révision 1621)
|
||||
--- sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (révision 1623)
|
||||
+++ sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (copie de travail)
|
||||
@@ -19,6 +19,7 @@
|
||||
02111-1307, USA.
|
||||
|
|
@ -1696,7 +1743,7 @@ Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m
|
|||
|
||||
Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h
|
||||
===================================================================
|
||||
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (révision 1621)
|
||||
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (révision 1623)
|
||||
+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (copie de travail)
|
||||
@@ -19,6 +19,8 @@
|
||||
02111-1307, USA.
|
||||
|
|
@ -1718,7 +1765,7 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h
|
|||
id<NSObject,SaxEntityResolver> entityResolver;
|
||||
Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m
|
||||
===================================================================
|
||||
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (révision 1621)
|
||||
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (révision 1623)
|
||||
+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (copie de travail)
|
||||
@@ -30,6 +30,12 @@
|
||||
#include <libxml/HTMLparser.h>
|
||||
|
|
@ -1778,7 +1825,7 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m
|
|||
- (void)tearDownParser {
|
||||
Index: sope-xml/libxmlSAXDriver/libxmlSAXDriver.m
|
||||
===================================================================
|
||||
--- sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (révision 1621)
|
||||
--- sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (révision 1623)
|
||||
+++ sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (copie de travail)
|
||||
@@ -614,7 +614,7 @@
|
||||
xmlParseDocument(ctxt);
|
||||
|
|
@ -1800,7 +1847,7 @@ Index: sope-xml/libxmlSAXDriver/libxmlSAXDriver.m
|
|||
xmlFreeParserCtxt(self->ctxt);
|
||||
Index: sope-appserver/mod_ngobjweb/config.c
|
||||
===================================================================
|
||||
--- sope-appserver/mod_ngobjweb/config.c (révision 1621)
|
||||
--- sope-appserver/mod_ngobjweb/config.c (révision 1623)
|
||||
+++ sope-appserver/mod_ngobjweb/config.c (copie de travail)
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
|
|
@ -1811,21 +1858,9 @@ Index: sope-appserver/mod_ngobjweb/config.c
|
|||
|
||||
static char *_makeString(char *buf, char *str, int max) {
|
||||
if (buf == NULL)
|
||||
Index: sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c
|
||||
===================================================================
|
||||
--- sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (révision 1621)
|
||||
+++ sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (copie de travail)
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
+#include "common.h"
|
||||
#include "NGBufferedDescriptor.h"
|
||||
|
||||
// returns the number of bytes which where read from the buffer
|
||||
Index: sope-appserver/mod_ngobjweb/GNUmakefile
|
||||
===================================================================
|
||||
--- sope-appserver/mod_ngobjweb/GNUmakefile (révision 1621)
|
||||
--- sope-appserver/mod_ngobjweb/GNUmakefile (révision 1623)
|
||||
+++ sope-appserver/mod_ngobjweb/GNUmakefile (copie de travail)
|
||||
@@ -82,7 +82,7 @@
|
||||
|
||||
|
|
@ -1846,9 +1881,21 @@ Index: sope-appserver/mod_ngobjweb/GNUmakefile
|
|||
|
||||
install-usr-libexec :: all
|
||||
$(INSTALL_PROGRAM) $(product) /usr/libexec/httpd/
|
||||
Index: sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c
|
||||
===================================================================
|
||||
--- sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (révision 1623)
|
||||
+++ sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (copie de travail)
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
+#include "common.h"
|
||||
#include "NGBufferedDescriptor.h"
|
||||
|
||||
// returns the number of bytes which where read from the buffer
|
||||
Index: sope-appserver/NGObjWeb/GNUmakefile.postamble
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/GNUmakefile.postamble (révision 1621)
|
||||
--- sope-appserver/NGObjWeb/GNUmakefile.postamble (révision 1623)
|
||||
+++ sope-appserver/NGObjWeb/GNUmakefile.postamble (copie de travail)
|
||||
@@ -23,14 +23,20 @@
|
||||
|
||||
|
|
@ -1880,7 +1927,7 @@ Index: sope-appserver/NGObjWeb/GNUmakefile.postamble
|
|||
+ $(DESTDIR)/$(GNUSTEP_MAKEFILES)/wobundle.make
|
||||
Index: sope-appserver/NGObjWeb/WOContext.m
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/WOContext.m (révision 1621)
|
||||
--- sope-appserver/NGObjWeb/WOContext.m (révision 1623)
|
||||
+++ sope-appserver/NGObjWeb/WOContext.m (copie de travail)
|
||||
@@ -64,11 +64,13 @@
|
||||
static BOOL testNSURLs = NO;
|
||||
|
|
@ -1920,7 +1967,7 @@ Index: sope-appserver/NGObjWeb/WOContext.m
|
|||
serverURL = [@"http://" stringByAppendingString:host];
|
||||
Index: sope-appserver/NGObjWeb/DAVPropMap.plist
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/DAVPropMap.plist (révision 1621)
|
||||
--- sope-appserver/NGObjWeb/DAVPropMap.plist (révision 1623)
|
||||
+++ sope-appserver/NGObjWeb/DAVPropMap.plist (copie de travail)
|
||||
@@ -24,13 +24,19 @@
|
||||
"{DAV:}status" = "davStatus";
|
||||
|
|
@ -1995,7 +2042,7 @@ Index: sope-appserver/NGObjWeb/DAVPropMap.plist
|
|||
"{http://groupdav.org/}component-set" = gdavComponentSet;
|
||||
Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (révision 1621)
|
||||
--- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (révision 1623)
|
||||
+++ sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (copie de travail)
|
||||
@@ -655,6 +655,7 @@
|
||||
if (self->responses == nil)
|
||||
|
|
@ -2007,9 +2054,9 @@ Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m
|
|||
case 'n':
|
||||
Index: sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (révision 1621)
|
||||
--- sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (révision 1623)
|
||||
+++ sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (copie de travail)
|
||||
@@ -1523,14 +1523,16 @@
|
||||
@@ -1523,16 +1523,16 @@
|
||||
- (id)doREPORT:(WOContext *)_ctx {
|
||||
id<DOMDocument> domDocument;
|
||||
WORequest *rq;
|
||||
|
|
@ -2021,7 +2068,9 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m
|
|||
|
||||
/* ensure XML */
|
||||
|
||||
- if (![[rq headerForKey:@"content-type"] hasPrefix:@"text/xml"]) {
|
||||
- if ((![[rq headerForKey:@"content-type"] hasPrefix:@"text/xml"]) &&
|
||||
- (![[rq headerForKey:@"content-type"] hasPrefix:@"application/xml"]))
|
||||
- {
|
||||
+ ctype = [rq headerForKey:@"content-type"];
|
||||
+ if (!([ctype hasPrefix:@"text/xml"]
|
||||
+ || [ctype hasPrefix:@"application/xml"])) {
|
||||
|
|
@ -2030,7 +2079,7 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m
|
|||
}
|
||||
Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (révision 1621)
|
||||
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (révision 1623)
|
||||
+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (copie de travail)
|
||||
@@ -216,6 +216,12 @@
|
||||
assocCount++;
|
||||
|
|
@ -2047,7 +2096,7 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
|
|||
|
||||
Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (révision 1621)
|
||||
--- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (révision 1623)
|
||||
+++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (copie de travail)
|
||||
@@ -41,6 +41,7 @@
|
||||
WOAssociation *string;
|
||||
|
|
@ -2080,7 +2129,7 @@ Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
|
|||
return NO;
|
||||
Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (révision 1621)
|
||||
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (révision 1623)
|
||||
+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (copie de travail)
|
||||
@@ -41,7 +41,8 @@
|
||||
WOAssociation *pageName;
|
||||
|
|
@ -2094,7 +2143,7 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h
|
|||
/* 'ivar' associations */
|
||||
Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/SoObjects/SoObject.m (révision 1621)
|
||||
--- sope-appserver/NGObjWeb/SoObjects/SoObject.m (révision 1623)
|
||||
+++ sope-appserver/NGObjWeb/SoObjects/SoObject.m (copie de travail)
|
||||
@@ -39,22 +39,34 @@
|
||||
static int debugLookup = -1;
|
||||
|
|
@ -2245,7 +2294,7 @@ Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m
|
|||
|
||||
Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (révision 1621)
|
||||
--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (révision 1623)
|
||||
+++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (copie de travail)
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <NGObjWeb/WOCookie.h>
|
||||
Loading…
Reference in New Issue