mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-03-25 08:02:44 +00:00
Monotone-Parent: fd565bb36a2ef3a33d5549a38f33d77802404317
Monotone-Revision: d3b7b9b6f2789475874e26a2e065af34d06a3be0 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-04-05T21:48:22 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
@@ -1,185 +1,7 @@
|
||||
Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
|
||||
===================================================================
|
||||
--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (révision 1619)
|
||||
+++ 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,\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 1619)
|
||||
+++ 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];
|
||||
|
||||
Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m
|
||||
===================================================================
|
||||
--- sope-gdl1/Oracle8/OracleAdaptorChannelController.m (révision 1619)
|
||||
+++ 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/NGImap4Connection.m
|
||||
===================================================================
|
||||
--- sope-mime/NGImap4/NGImap4Connection.m (révision 1619)
|
||||
+++ sope-mime/NGImap4/NGImap4Connection.m (copie de travail)
|
||||
--- sope-mime/NGImap4/NGImap4Connection.m (revision 1620)
|
||||
+++ sope-mime/NGImap4/NGImap4Connection.m (working copy)
|
||||
@@ -381,7 +381,7 @@
|
||||
|
||||
if (debugCache) [self logWithFormat:@" no folders cached yet .."];
|
||||
@@ -191,8 +13,8 @@ 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 1619)
|
||||
+++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m (copie de travail)
|
||||
--- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (revision 1620)
|
||||
+++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m (working copy)
|
||||
@@ -648,14 +648,13 @@
|
||||
enumerator = [_flags objectEnumerator];
|
||||
cnt = 0;
|
||||
@@ -217,8 +39,8 @@ Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m
|
||||
if (objs) free(objs);
|
||||
Index: sope-mime/NGImap4/NGImap4ResponseParser.m
|
||||
===================================================================
|
||||
--- sope-mime/NGImap4/NGImap4ResponseParser.m (révision 1619)
|
||||
+++ sope-mime/NGImap4/NGImap4ResponseParser.m (copie de travail)
|
||||
--- sope-mime/NGImap4/NGImap4ResponseParser.m (revision 1620)
|
||||
+++ sope-mime/NGImap4/NGImap4ResponseParser.m (working copy)
|
||||
@@ -84,6 +84,8 @@
|
||||
static NSDictionary *_parseMultipartBody(NGImap4ResponseParser *self,
|
||||
BOOL isBodyStructure);
|
||||
@@ -442,8 +264,8 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m
|
||||
{
|
||||
Index: sope-mime/NGMail/NGSmtpClient.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMail/NGSmtpClient.m (révision 1619)
|
||||
+++ sope-mime/NGMail/NGSmtpClient.m (copie de travail)
|
||||
--- sope-mime/NGMail/NGSmtpClient.m (revision 1620)
|
||||
+++ sope-mime/NGMail/NGSmtpClient.m (working copy)
|
||||
@@ -24,6 +24,82 @@
|
||||
#include "NGSmtpReplyCodes.h"
|
||||
#include "common.h"
|
||||
@@ -598,8 +420,8 @@ Index: sope-mime/NGMail/NGSmtpClient.m
|
||||
reply = [self receiveReply];
|
||||
Index: sope-mime/NGMail/NGMimeMessageGenerator.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMail/NGMimeMessageGenerator.m (révision 1619)
|
||||
+++ sope-mime/NGMail/NGMimeMessageGenerator.m (copie de travail)
|
||||
--- sope-mime/NGMail/NGMimeMessageGenerator.m (revision 1620)
|
||||
+++ sope-mime/NGMail/NGMimeMessageGenerator.m (working copy)
|
||||
@@ -86,37 +86,40 @@
|
||||
char *des = NULL;
|
||||
unsigned int cnt;
|
||||
@@ -664,8 +486,8 @@ Index: sope-mime/NGMail/NGMimeMessageGenerator.m
|
||||
unsigned isoEndLen = 2;
|
||||
Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (révision 1619)
|
||||
+++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (copie de travail)
|
||||
--- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (revision 1620)
|
||||
+++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (working copy)
|
||||
@@ -19,88 +19,45 @@
|
||||
02111-1307, USA.
|
||||
*/
|
||||
@@ -1059,8 +881,8 @@ Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m
|
||||
#if 0
|
||||
Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (révision 1619)
|
||||
+++ sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (copie de travail)
|
||||
--- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (revision 1620)
|
||||
+++ sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (working copy)
|
||||
@@ -77,6 +77,7 @@
|
||||
[rfc822Set setGenerator:gen forField:@"bcc"];
|
||||
[rfc822Set setGenerator:gen forField:Fields->from];
|
||||
@@ -1071,8 +893,8 @@ Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m
|
||||
|
||||
Index: sope-mime/NGMime/NGMimeBodyPart.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimeBodyPart.m (révision 1619)
|
||||
+++ sope-mime/NGMime/NGMimeBodyPart.m (copie de travail)
|
||||
--- sope-mime/NGMime/NGMimeBodyPart.m (revision 1620)
|
||||
+++ sope-mime/NGMime/NGMimeBodyPart.m (working copy)
|
||||
@@ -31,18 +31,6 @@
|
||||
return 2;
|
||||
}
|
||||
@@ -1109,8 +931,8 @@ Index: sope-mime/NGMime/NGMimeBodyPart.m
|
||||
- (NSString *)contentId {
|
||||
Index: sope-mime/NGMime/GNUmakefile.preamble
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/GNUmakefile.preamble (révision 1619)
|
||||
+++ sope-mime/NGMime/GNUmakefile.preamble (copie de travail)
|
||||
--- sope-mime/NGMime/GNUmakefile.preamble (revision 1620)
|
||||
+++ sope-mime/NGMime/GNUmakefile.preamble (working copy)
|
||||
@@ -5,6 +5,11 @@
|
||||
-DLIBRARY_MINOR_VERSION=${MINOR_VERSION} \
|
||||
-DLIBRARY_SUBMINOR_VERSION=${SUBMINOR_VERSION} \
|
||||
@@ -1125,8 +947,8 @@ Index: sope-mime/NGMime/GNUmakefile.preamble
|
||||
-I../../sope-core/NGStreams/ \
|
||||
Index: sope-mime/NGMime/NGMimeBodyParser.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimeBodyParser.m (révision 1619)
|
||||
+++ sope-mime/NGMime/NGMimeBodyParser.m (copie de travail)
|
||||
--- sope-mime/NGMime/NGMimeBodyParser.m (revision 1620)
|
||||
+++ sope-mime/NGMime/NGMimeBodyParser.m (working copy)
|
||||
@@ -67,7 +67,10 @@
|
||||
if (_data == nil) return nil;
|
||||
|
||||
@@ -1141,8 +963,8 @@ Index: sope-mime/NGMime/NGMimeBodyParser.m
|
||||
|
||||
Index: sope-mime/NGMime/NGMimePartParser.h
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimePartParser.h (révision 1619)
|
||||
+++ sope-mime/NGMime/NGMimePartParser.h (copie de travail)
|
||||
--- sope-mime/NGMime/NGMimePartParser.h (revision 1620)
|
||||
+++ sope-mime/NGMime/NGMimePartParser.h (working copy)
|
||||
@@ -117,6 +117,7 @@
|
||||
BOOL parserParseRawBodyDataOfPart:1;
|
||||
BOOL parserBodyParserForPart:1;
|
||||
@@ -1163,8 +985,8 @@ Index: sope-mime/NGMime/NGMimePartParser.h
|
||||
@interface NSObject(NGMimePartParser)
|
||||
Index: sope-mime/NGMime/NGMimePartParser.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimePartParser.m (révision 1619)
|
||||
+++ sope-mime/NGMime/NGMimePartParser.m (copie de travail)
|
||||
--- sope-mime/NGMime/NGMimePartParser.m (revision 1620)
|
||||
+++ sope-mime/NGMime/NGMimePartParser.m (working copy)
|
||||
@@ -227,7 +227,7 @@
|
||||
}
|
||||
|
||||
@@ -1188,8 +1010,8 @@ Index: sope-mime/NGMime/NGMimePartParser.m
|
||||
: [NGMimeType mimeType:[ctype stringValue]];
|
||||
Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (révision 1619)
|
||||
+++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (copie de travail)
|
||||
--- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (revision 1620)
|
||||
+++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (working copy)
|
||||
@@ -130,8 +130,13 @@
|
||||
|
||||
if (doEnc) {
|
||||
@@ -1219,8 +1041,8 @@ Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m
|
||||
bufLen = [data length];
|
||||
Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (révision 1619)
|
||||
+++ sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (copie de travail)
|
||||
--- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (revision 1620)
|
||||
+++ sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (working copy)
|
||||
@@ -49,80 +49,70 @@
|
||||
|
||||
// TODO: move the stuff below to some NSString or NSData category?
|
||||
@@ -1353,10 +1175,188 @@ Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m
|
||||
}
|
||||
return data;
|
||||
}
|
||||
Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
|
||||
===================================================================
|
||||
--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (revision 1620)
|
||||
+++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (working copy)
|
||||
@@ -713,6 +713,39 @@
|
||||
return ms;
|
||||
}
|
||||
|
||||
+/* GCSEOAdaptorChannel protocol */
|
||||
+static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n" \
|
||||
+ @" c_name VARCHAR (256) NOT NULL,\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 (revision 1620)
|
||||
+++ sope-gdl1/Oracle8/OracleAdaptorChannel.m (working copy)
|
||||
@@ -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];
|
||||
|
||||
Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m
|
||||
===================================================================
|
||||
--- sope-gdl1/Oracle8/OracleAdaptorChannelController.m (revision 1620)
|
||||
+++ sope-gdl1/Oracle8/OracleAdaptorChannelController.m (working copy)
|
||||
@@ -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/FdExt.subproj/NSString+Encoding.m
|
||||
===================================================================
|
||||
--- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (révision 1619)
|
||||
+++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (copie de travail)
|
||||
--- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (revision 1620)
|
||||
+++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (working copy)
|
||||
@@ -140,8 +140,12 @@
|
||||
|
||||
|
||||
@@ -1398,8 +1398,8 @@ 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 1619)
|
||||
+++ sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (copie de travail)
|
||||
--- sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (revision 1620)
|
||||
+++ sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (working copy)
|
||||
@@ -19,6 +19,7 @@
|
||||
02111-1307, USA.
|
||||
*/
|
||||
@@ -1410,8 +1410,8 @@ Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m
|
||||
|
||||
Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h
|
||||
===================================================================
|
||||
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (révision 1619)
|
||||
+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (copie de travail)
|
||||
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (revision 1620)
|
||||
+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (working copy)
|
||||
@@ -19,6 +19,8 @@
|
||||
02111-1307, USA.
|
||||
*/
|
||||
@@ -1432,8 +1432,8 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h
|
||||
id<NSObject,SaxEntityResolver> entityResolver;
|
||||
Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m
|
||||
===================================================================
|
||||
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (révision 1619)
|
||||
+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (copie de travail)
|
||||
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (revision 1620)
|
||||
+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (working copy)
|
||||
@@ -30,6 +30,12 @@
|
||||
#include <libxml/HTMLparser.h>
|
||||
#include <libxml/HTMLtree.h>
|
||||
@@ -1492,8 +1492,8 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m
|
||||
- (void)tearDownParser {
|
||||
Index: sope-appserver/mod_ngobjweb/config.c
|
||||
===================================================================
|
||||
--- sope-appserver/mod_ngobjweb/config.c (révision 1619)
|
||||
+++ sope-appserver/mod_ngobjweb/config.c (copie de travail)
|
||||
--- sope-appserver/mod_ngobjweb/config.c (revision 1620)
|
||||
+++ sope-appserver/mod_ngobjweb/config.c (working copy)
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include "common.h"
|
||||
@@ -1505,8 +1505,8 @@ Index: sope-appserver/mod_ngobjweb/config.c
|
||||
if (buf == NULL)
|
||||
Index: sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c
|
||||
===================================================================
|
||||
--- sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (révision 1619)
|
||||
+++ sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (copie de travail)
|
||||
--- sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (revision 1620)
|
||||
+++ sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (working copy)
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
@@ -1517,8 +1517,8 @@ Index: sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c
|
||||
// returns the number of bytes which where read from the buffer
|
||||
Index: sope-appserver/mod_ngobjweb/GNUmakefile
|
||||
===================================================================
|
||||
--- sope-appserver/mod_ngobjweb/GNUmakefile (révision 1619)
|
||||
+++ sope-appserver/mod_ngobjweb/GNUmakefile (copie de travail)
|
||||
--- sope-appserver/mod_ngobjweb/GNUmakefile (revision 1620)
|
||||
+++ sope-appserver/mod_ngobjweb/GNUmakefile (working copy)
|
||||
@@ -82,7 +82,7 @@
|
||||
|
||||
CFLAGS = -Wall -I. -fPIC \
|
||||
@@ -1528,103 +1528,10 @@ Index: sope-appserver/mod_ngobjweb/GNUmakefile
|
||||
|
||||
LDFLAGS = $(APXS_LDFLAGS) $(APR_LDFLAGS) -shared -fPIC
|
||||
LDLIBS = $(APXS_LIBS) $(APR_LIBS)
|
||||
Index: sope-appserver/mod_ngobjweb/handler.c
|
||||
===================================================================
|
||||
--- sope-appserver/mod_ngobjweb/handler.c (révision 1619)
|
||||
+++ sope-appserver/mod_ngobjweb/handler.c (copie de travail)
|
||||
@@ -646,7 +646,10 @@
|
||||
|
||||
writeErrorHandler:
|
||||
if (writeError == 1) {
|
||||
- if (toApp) NGBufferedDescriptor_free(toApp);
|
||||
+ if (toApp) {
|
||||
+ NGBufferedDescriptor_free(toApp);
|
||||
+ toApp = NULL;
|
||||
+ }
|
||||
|
||||
ap_log_error(__FILE__, __LINE__, APLOG_ERR, 0, r->server,
|
||||
"socket write error during transfer of HTTP header section");
|
||||
@@ -659,7 +662,10 @@
|
||||
if (!NGBufferedDescriptor_safeWrite(toApp,
|
||||
requestBody,
|
||||
requestContentLength)) {
|
||||
- if (toApp) NGBufferedDescriptor_free(toApp);
|
||||
+ if (toApp) {
|
||||
+ NGBufferedDescriptor_free(toApp);
|
||||
+ toApp = NULL;
|
||||
+ }
|
||||
ap_log_error(__FILE__, __LINE__, APLOG_ERR, 0, r->server,
|
||||
"couldn't transfer HTTP req body to app server (%i bytes)",
|
||||
contentLength);
|
||||
@@ -677,7 +683,10 @@
|
||||
/* read response line */
|
||||
|
||||
if (!NGScanResponseLine(toApp, NULL, &statusCode, NULL)) {
|
||||
- if (toApp) NGBufferedDescriptor_free(toApp);
|
||||
+ if (toApp) {
|
||||
+ NGBufferedDescriptor_free(toApp);
|
||||
+ toApp = NULL;
|
||||
+ }
|
||||
ap_log_error(__FILE__, __LINE__, APLOG_ERR, 0, r->server,
|
||||
"error during reading of response line ..");
|
||||
return 500;
|
||||
@@ -716,13 +725,8 @@
|
||||
}
|
||||
|
||||
// read whole response
|
||||
- if (!NGBufferedDescriptor_safeRead(toApp, buffer, contentLength)) {
|
||||
- if (toApp != NULL) { NGBufferedDescriptor_free(toApp); toApp = NULL; }
|
||||
- }
|
||||
+ NGBufferedDescriptor_safeRead(toApp, buffer, contentLength);
|
||||
|
||||
- // close connection to app
|
||||
- if (toApp != NULL) { NGBufferedDescriptor_free(toApp); toApp = NULL; }
|
||||
-
|
||||
ap_log_error(__FILE__, __LINE__, APLOG_INFO, 0, r->server,
|
||||
"send response (size=%i)",
|
||||
contentLength);
|
||||
@@ -736,15 +740,14 @@
|
||||
int result = 0;
|
||||
int writeCount = 0;
|
||||
|
||||
- do {
|
||||
- result = NGBufferedDescriptor_read(toApp, buffer, sizeof(buffer));
|
||||
- if (result > 0) {
|
||||
- ap_rwrite(buffer, result, r);
|
||||
- ap_rflush(r);
|
||||
- writeCount += result;
|
||||
- }
|
||||
+ while ((result = NGBufferedDescriptor_read(toApp,
|
||||
+ buffer,
|
||||
+ sizeof(buffer))
|
||||
+ > 0)) {
|
||||
+ ap_rwrite(buffer, result, r);
|
||||
+ ap_rflush(r);
|
||||
+ writeCount += result;
|
||||
}
|
||||
- while (result > 0);
|
||||
|
||||
if (HEAVY_LOG && (writeCount > 0)) {
|
||||
ap_log_error(__FILE__, __LINE__, APLOG_INFO, 0, r->server,
|
||||
@@ -753,7 +756,13 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
-
|
||||
+
|
||||
+ // close connection to app
|
||||
+ if (toApp) {
|
||||
+ NGBufferedDescriptor_free(toApp);
|
||||
+ toApp = NULL;
|
||||
+ }
|
||||
+
|
||||
return OK;
|
||||
}
|
||||
|
||||
Index: sope-appserver/NGObjWeb/GNUmakefile.postamble
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/GNUmakefile.postamble (révision 1619)
|
||||
+++ sope-appserver/NGObjWeb/GNUmakefile.postamble (copie de travail)
|
||||
--- sope-appserver/NGObjWeb/GNUmakefile.postamble (revision 1620)
|
||||
+++ sope-appserver/NGObjWeb/GNUmakefile.postamble (working copy)
|
||||
@@ -23,14 +23,20 @@
|
||||
|
||||
# install makefiles
|
||||
@@ -1655,8 +1562,8 @@ Index: sope-appserver/NGObjWeb/GNUmakefile.postamble
|
||||
+ $(DESTDIR)/$(GNUSTEP_MAKEFILES)/wobundle.make
|
||||
Index: sope-appserver/NGObjWeb/WOContext.m
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/WOContext.m (révision 1619)
|
||||
+++ sope-appserver/NGObjWeb/WOContext.m (copie de travail)
|
||||
--- sope-appserver/NGObjWeb/WOContext.m (revision 1620)
|
||||
+++ sope-appserver/NGObjWeb/WOContext.m (working copy)
|
||||
@@ -64,11 +64,13 @@
|
||||
static BOOL testNSURLs = NO;
|
||||
static BOOL newCURLStyle = NO;
|
||||
@@ -1695,8 +1602,8 @@ Index: sope-appserver/NGObjWeb/WOContext.m
|
||||
serverURL = [@"http://" stringByAppendingString:host];
|
||||
Index: sope-appserver/NGObjWeb/DAVPropMap.plist
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/DAVPropMap.plist (révision 1619)
|
||||
+++ sope-appserver/NGObjWeb/DAVPropMap.plist (copie de travail)
|
||||
--- sope-appserver/NGObjWeb/DAVPropMap.plist (revision 1620)
|
||||
+++ sope-appserver/NGObjWeb/DAVPropMap.plist (working copy)
|
||||
@@ -120,17 +120,21 @@
|
||||
"{http://ucb.openoffice.org/dav/props/}IsRemoveable" = isOOoRemoveable;
|
||||
"{http://ucb.openoffice.org/dav/props/}IsVolume" = isOOoVolume;
|
||||
@@ -1723,8 +1630,8 @@ Index: sope-appserver/NGObjWeb/DAVPropMap.plist
|
||||
"{urn:ietf:params:xml:ns:carddav}supported-address-data" =
|
||||
Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (révision 1619)
|
||||
+++ sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (copie de travail)
|
||||
--- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (revision 1620)
|
||||
+++ sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (working copy)
|
||||
@@ -655,6 +655,7 @@
|
||||
if (self->responses == nil)
|
||||
self->responses = [[NSMutableArray alloc] initWithCapacity:64];
|
||||
@@ -1735,8 +1642,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m
|
||||
case 'n':
|
||||
Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (révision 1619)
|
||||
+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (copie de travail)
|
||||
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (revision 1620)
|
||||
+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (working copy)
|
||||
@@ -216,6 +216,12 @@
|
||||
assocCount++;
|
||||
}
|
||||
@@ -1752,8 +1659,8 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
|
||||
|
||||
Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (révision 1619)
|
||||
+++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (copie de travail)
|
||||
--- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (revision 1620)
|
||||
+++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (working copy)
|
||||
@@ -41,6 +41,7 @@
|
||||
WOAssociation *string;
|
||||
WOAssociation *target;
|
||||
@@ -1785,8 +1692,8 @@ Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
|
||||
return NO;
|
||||
Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (révision 1619)
|
||||
+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (copie de travail)
|
||||
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (revision 1620)
|
||||
+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (working copy)
|
||||
@@ -41,7 +41,8 @@
|
||||
WOAssociation *pageName;
|
||||
WOAssociation *actionClass;
|
||||
@@ -1799,8 +1706,8 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h
|
||||
/* 'ivar' associations */
|
||||
Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/SoObjects/SoObject.m (révision 1619)
|
||||
+++ sope-appserver/NGObjWeb/SoObjects/SoObject.m (copie de travail)
|
||||
--- sope-appserver/NGObjWeb/SoObjects/SoObject.m (revision 1620)
|
||||
+++ sope-appserver/NGObjWeb/SoObjects/SoObject.m (working copy)
|
||||
@@ -39,22 +39,34 @@
|
||||
static int debugLookup = -1;
|
||||
static int debugBaseURL = -1;
|
||||
@@ -1950,8 +1857,8 @@ Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m
|
||||
|
||||
Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (révision 1619)
|
||||
+++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (copie de travail)
|
||||
--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (revision 1620)
|
||||
+++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (working copy)
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <NGObjWeb/WOCookie.h>
|
||||
#include <NGExtensions/NSData+gzip.h>
|
||||
Reference in New Issue
Block a user