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

Monotone-Parent: 17fbb038ecae79b08f511eacf0417a89716461bc 

Monotone-Revision: dfc94cc52c59379dedd9711f5b27a4bb2429a045

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-08-29T19:25:36
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2008-08-29 19:25:36 +00:00
parent 81e9c338a0
commit 86b0524852
1 changed files with 306 additions and 298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

604
SOPE/sope-patchset-r1626.diff
View File

@ -1,194 +1,7 @@
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 Index: sope-mime/NGImap4/NGImap4Client.h
=================================================================== ===================================================================
--- sope-mime/NGImap4/NGImap4Client.h (révision 1626) --- sope-mime/NGImap4/NGImap4Client.h (revision 1626)
+++ sope-mime/NGImap4/NGImap4Client.h (copie de travail) +++ sope-mime/NGImap4/NGImap4Client.h (working copy)
@@ -120,6 +120,7 @@ @@ -120,6 +120,7 @@
- (NSDictionary *)list:(NSString *)_folder pattern:(NSString *)_pattern; - (NSDictionary *)list:(NSString *)_folder pattern:(NSString *)_pattern;
- (NSDictionary *)lsub:(NSString *)_folder pattern:(NSString *)_pattern; - (NSDictionary *)lsub:(NSString *)_folder pattern:(NSString *)_pattern;
@ -208,8 +21,8 @@ Index: sope-mime/NGImap4/NGImap4Client.h
- (NSDictionary *)copyUid:(unsigned)_uid toFolder:(NSString *)_folder; - (NSDictionary *)copyUid:(unsigned)_uid toFolder:(NSString *)_folder;
Index: sope-mime/NGImap4/NGImap4Client.m Index: sope-mime/NGImap4/NGImap4Client.m
=================================================================== ===================================================================
--- sope-mime/NGImap4/NGImap4Client.m (révision 1626) --- sope-mime/NGImap4/NGImap4Client.m (revision 1626)
+++ sope-mime/NGImap4/NGImap4Client.m (copie de travail) +++ sope-mime/NGImap4/NGImap4Client.m (working copy)
@@ -24,6 +24,8 @@ @@ -24,6 +24,8 @@
#include "NGImap4Client.h" #include "NGImap4Client.h"
#include "NGImap4Context.h" #include "NGImap4Context.h"
@ -255,7 +68,15 @@ Index: sope-mime/NGImap4/NGImap4Client.m
@end @end
/* /*
@@ -635,6 +639,10 @@ @@ -508,6 +512,7 @@
map = [self processCommand:@"logout"];
[self closeConnection];
+ [self->selectedFolder release]; self->selectedFolder = nil;
return [self->normer normalizeResponse:map];
}
@@ -635,6 +640,10 @@
return [self->normer normalizeSelectResponse:[self processCommand:s]]; return [self->normer normalizeSelectResponse:[self processCommand:s]];
} }
@ -266,7 +87,7 @@ Index: sope-mime/NGImap4/NGImap4Client.m
- (NSDictionary *)status:(NSString *)_folder flags:(NSArray *)_flags { - (NSDictionary *)status:(NSString *)_folder flags:(NSArray *)_flags {
NSString *cmd; NSString *cmd;
@@ -820,23 +828,23 @@ @@ -820,23 +829,23 @@
return [self->normer normalizeResponse:[self processCommand:cmd]]; return [self->normer normalizeResponse:[self processCommand:cmd]];
} }
@ -296,7 +117,7 @@ Index: sope-mime/NGImap4/NGImap4Client.m
seqstr, _flag ? '+' : '-', flagstr]; seqstr, _flag ? '+' : '-', flagstr];
return [self->normer normalizeResponse:[self processCommand:cmd]]; return [self->normer normalizeResponse:[self processCommand:cmd]];
@@ -967,11 +975,12 @@ @@ -967,11 +976,12 @@
descr = @"Could not process qualifier for imap search "; descr = @"Could not process qualifier for imap search ";
descr = [descr stringByAppendingString:reason]; descr = [descr stringByAppendingString:reason];
@ -312,7 +133,7 @@ Index: sope-mime/NGImap4/NGImap4Client.m
} }
- (NSString *)_searchExprForQual:(EOQualifier *)_qualifier { - (NSString *)_searchExprForQual:(EOQualifier *)_qualifier {
@@ -1093,7 +1102,18 @@ @@ -1093,7 +1103,18 @@
Eg: UID SORT ( DATE REVERSE SUBJECT ) UTF-8 TODO Eg: UID SORT ( DATE REVERSE SUBJECT ) UTF-8 TODO
*/ */
NSString *tmp; NSString *tmp;
@ -331,7 +152,7 @@ Index: sope-mime/NGImap4/NGImap4Client.m
if ([_sortSpec isKindOfClass:[NSArray class]]) if ([_sortSpec isKindOfClass:[NSArray class]])
tmp = [self _generateIMAP4SortOrderings:_sortSpec]; tmp = [self _generateIMAP4SortOrderings:_sortSpec];
else if ([_sortSpec isKindOfClass:[EOSortOrdering class]]) else if ([_sortSpec isKindOfClass:[EOSortOrdering class]])
@@ -1107,9 +1127,10 @@ @@ -1107,9 +1128,10 @@
tmp = @"DATE"; tmp = @"DATE";
} }
@ -344,7 +165,7 @@ Index: sope-mime/NGImap4/NGImap4Client.m
} }
- (NSDictionary *)sort:(NSArray *)_sortOrderings - (NSDictionary *)sort:(NSArray *)_sortOrderings
qualifier:(EOQualifier *)_qual qualifier:(EOQualifier *)_qual
@@ -1130,7 +1151,7 @@ @@ -1130,7 +1152,7 @@
return nil; return nil;
} }
@ -353,7 +174,7 @@ Index: sope-mime/NGImap4/NGImap4Client.m
return [self->normer normalizeSearchResponse:[self processCommand:s]]; return [self->normer normalizeSearchResponse:[self processCommand:s]];
} }
@@ -1193,6 +1214,79 @@ @@ -1193,6 +1215,79 @@
/* Private Methods */ /* Private Methods */
@ -435,8 +256,8 @@ Index: sope-mime/NGImap4/NGImap4Client.m
__PRETTY_FUNCTION__, [_exception name], [_exception reason]]; __PRETTY_FUNCTION__, [_exception name], [_exception reason]];
Index: sope-mime/NGImap4/NGImap4Connection.m Index: sope-mime/NGImap4/NGImap4Connection.m
=================================================================== ===================================================================
--- sope-mime/NGImap4/NGImap4Connection.m (révision 1626) --- sope-mime/NGImap4/NGImap4Connection.m (revision 1626)
+++ sope-mime/NGImap4/NGImap4Connection.m (copie de travail) +++ sope-mime/NGImap4/NGImap4Connection.m (working copy)
@@ -381,7 +381,7 @@ @@ -381,7 +381,7 @@
if (debugCache) [self logWithFormat:@" no folders cached yet .."]; if (debugCache) [self logWithFormat:@" no folders cached yet .."];
@ -457,8 +278,8 @@ Index: sope-mime/NGImap4/NGImap4Connection.m
text:@"Failed to change flags of IMAP4 message"]; text:@"Failed to change flags of IMAP4 message"];
Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m
=================================================================== ===================================================================
--- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (révision 1626) --- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (revision 1626)
+++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m (copie de travail) +++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m (working copy)
@@ -648,14 +648,13 @@ @@ -648,14 +648,13 @@
enumerator = [_flags objectEnumerator]; enumerator = [_flags objectEnumerator];
cnt = 0; cnt = 0;
@ -483,8 +304,8 @@ Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m
if (objs) free(objs); if (objs) free(objs);
Index: sope-mime/NGImap4/NGImap4ResponseParser.m Index: sope-mime/NGImap4/NGImap4ResponseParser.m
=================================================================== ===================================================================
--- sope-mime/NGImap4/NGImap4ResponseParser.m (révision 1626) --- sope-mime/NGImap4/NGImap4ResponseParser.m (revision 1626)
+++ sope-mime/NGImap4/NGImap4ResponseParser.m (copie de travail) +++ sope-mime/NGImap4/NGImap4ResponseParser.m (working copy)
@@ -84,6 +84,8 @@ @@ -84,6 +84,8 @@
static NSDictionary *_parseMultipartBody(NGImap4ResponseParser *self, static NSDictionary *_parseMultipartBody(NGImap4ResponseParser *self,
BOOL isBodyStructure); BOOL isBodyStructure);
@ -708,8 +529,8 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m
{ {
Index: sope-mime/NGImap4/ChangeLog Index: sope-mime/NGImap4/ChangeLog
=================================================================== ===================================================================
--- sope-mime/NGImap4/ChangeLog (révision 1626) --- sope-mime/NGImap4/ChangeLog (revision 1626)
+++ sope-mime/NGImap4/ChangeLog (copie de travail) +++ sope-mime/NGImap4/ChangeLog (working copy)
@@ -1,3 +1,8 @@ @@ -1,3 +1,8 @@
+2008-08-28 Wolfgang Sourdeau <wsourdeau@inverse.ca> +2008-08-28 Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ +
@ -721,8 +542,8 @@ Index: sope-mime/NGImap4/ChangeLog
* NGImap4Connection.m: some fix for folders ending with a slash (OGo * NGImap4Connection.m: some fix for folders ending with a slash (OGo
Index: sope-mime/NGMail/NGSmtpClient.m Index: sope-mime/NGMail/NGSmtpClient.m
=================================================================== ===================================================================
--- sope-mime/NGMail/NGSmtpClient.m (révision 1626) --- sope-mime/NGMail/NGSmtpClient.m (revision 1626)
+++ sope-mime/NGMail/NGSmtpClient.m (copie de travail) +++ sope-mime/NGMail/NGSmtpClient.m (working copy)
@@ -24,6 +24,82 @@ @@ -24,6 +24,82 @@
#include "NGSmtpReplyCodes.h" #include "NGSmtpReplyCodes.h"
#include "common.h" #include "common.h"
@ -877,8 +698,8 @@ Index: sope-mime/NGMail/NGSmtpClient.m
reply = [self receiveReply]; reply = [self receiveReply];
Index: sope-mime/NGMail/NGMailAddressParser.h Index: sope-mime/NGMail/NGMailAddressParser.h
=================================================================== ===================================================================
--- sope-mime/NGMail/NGMailAddressParser.h (révision 1626) --- sope-mime/NGMail/NGMailAddressParser.h (revision 1626)
+++ sope-mime/NGMail/NGMailAddressParser.h (copie de travail) +++ sope-mime/NGMail/NGMailAddressParser.h (working copy)
@@ -24,7 +24,9 @@ @@ -24,7 +24,9 @@
#import <Foundation/NSObject.h> #import <Foundation/NSObject.h>
@ -915,8 +736,8 @@ Index: sope-mime/NGMail/NGMailAddressParser.h
Index: sope-mime/NGMail/NGMimeMessageGenerator.m Index: sope-mime/NGMail/NGMimeMessageGenerator.m
=================================================================== ===================================================================
--- sope-mime/NGMail/NGMimeMessageGenerator.m (révision 1626) --- sope-mime/NGMail/NGMimeMessageGenerator.m (revision 1626)
+++ sope-mime/NGMail/NGMimeMessageGenerator.m (copie de travail) +++ sope-mime/NGMail/NGMimeMessageGenerator.m (working copy)
@@ -86,37 +86,40 @@ @@ -86,37 +86,40 @@
char *des = NULL; char *des = NULL;
unsigned int cnt; unsigned int cnt;
@ -981,8 +802,8 @@ Index: sope-mime/NGMail/NGMimeMessageGenerator.m
unsigned isoEndLen = 2; unsigned isoEndLen = 2;
Index: sope-mime/NGMail/NGMailAddressParser.m Index: sope-mime/NGMail/NGMailAddressParser.m
=================================================================== ===================================================================
--- sope-mime/NGMail/NGMailAddressParser.m (révision 1626) --- sope-mime/NGMail/NGMailAddressParser.m (revision 1626)
+++ sope-mime/NGMail/NGMailAddressParser.m (copie de travail) +++ sope-mime/NGMail/NGMailAddressParser.m (working copy)
@@ -52,9 +52,9 @@ @@ -52,9 +52,9 @@
StrClass = [NSString class]; StrClass = [NSString class];
} }
@ -1126,8 +947,8 @@ Index: sope-mime/NGMail/NGMailAddressParser.m
self->dataPos = 0; self->dataPos = 0;
Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m
=================================================================== ===================================================================
--- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (révision 1626) --- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (revision 1626)
+++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (copie de travail) +++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (working copy)
@@ -19,88 +19,45 @@ @@ -19,88 +19,45 @@
02111-1307, USA. 02111-1307, USA.
*/ */
@ -1521,8 +1342,8 @@ Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m
#if 0 #if 0
Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m
=================================================================== ===================================================================
--- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (révision 1626) --- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (revision 1626)
+++ sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (copie de travail) +++ sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (working copy)
@@ -77,6 +77,7 @@ @@ -77,6 +77,7 @@
[rfc822Set setGenerator:gen forField:@"bcc"]; [rfc822Set setGenerator:gen forField:@"bcc"];
[rfc822Set setGenerator:gen forField:Fields->from]; [rfc822Set setGenerator:gen forField:Fields->from];
@ -1533,8 +1354,8 @@ Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m
Index: sope-mime/NGMime/NGMimeBodyPart.m Index: sope-mime/NGMime/NGMimeBodyPart.m
=================================================================== ===================================================================
--- sope-mime/NGMime/NGMimeBodyPart.m (révision 1626) --- sope-mime/NGMime/NGMimeBodyPart.m (revision 1626)
+++ sope-mime/NGMime/NGMimeBodyPart.m (copie de travail) +++ sope-mime/NGMime/NGMimeBodyPart.m (working copy)
@@ -31,18 +31,6 @@ @@ -31,18 +31,6 @@
return 2; return 2;
} }
@ -1571,8 +1392,8 @@ Index: sope-mime/NGMime/NGMimeBodyPart.m
- (NSString *)contentId { - (NSString *)contentId {
Index: sope-mime/NGMime/GNUmakefile.preamble Index: sope-mime/NGMime/GNUmakefile.preamble
=================================================================== ===================================================================
--- sope-mime/NGMime/GNUmakefile.preamble (révision 1626) --- sope-mime/NGMime/GNUmakefile.preamble (revision 1626)
+++ sope-mime/NGMime/GNUmakefile.preamble (copie de travail) +++ sope-mime/NGMime/GNUmakefile.preamble (working copy)
@@ -5,6 +5,11 @@ @@ -5,6 +5,11 @@
-DLIBRARY_MINOR_VERSION=${MINOR_VERSION} \ -DLIBRARY_MINOR_VERSION=${MINOR_VERSION} \
-DLIBRARY_SUBMINOR_VERSION=${SUBMINOR_VERSION} \ -DLIBRARY_SUBMINOR_VERSION=${SUBMINOR_VERSION} \
@ -1587,8 +1408,8 @@ Index: sope-mime/NGMime/GNUmakefile.preamble
-I../../sope-core/NGStreams/ \ -I../../sope-core/NGStreams/ \
Index: sope-mime/NGMime/NGMimeBodyParser.m Index: sope-mime/NGMime/NGMimeBodyParser.m
=================================================================== ===================================================================
--- sope-mime/NGMime/NGMimeBodyParser.m (révision 1626) --- sope-mime/NGMime/NGMimeBodyParser.m (revision 1626)
+++ sope-mime/NGMime/NGMimeBodyParser.m (copie de travail) +++ sope-mime/NGMime/NGMimeBodyParser.m (working copy)
@@ -67,7 +67,10 @@ @@ -67,7 +67,10 @@
if (_data == nil) return nil; if (_data == nil) return nil;
@ -1603,8 +1424,8 @@ Index: sope-mime/NGMime/NGMimeBodyParser.m
Index: sope-mime/NGMime/NGMimePartParser.h Index: sope-mime/NGMime/NGMimePartParser.h
=================================================================== ===================================================================
--- sope-mime/NGMime/NGMimePartParser.h (révision 1626) --- sope-mime/NGMime/NGMimePartParser.h (revision 1626)
+++ sope-mime/NGMime/NGMimePartParser.h (copie de travail) +++ sope-mime/NGMime/NGMimePartParser.h (working copy)
@@ -117,6 +117,7 @@ @@ -117,6 +117,7 @@
BOOL parserParseRawBodyDataOfPart:1; BOOL parserParseRawBodyDataOfPart:1;
BOOL parserBodyParserForPart:1; BOOL parserBodyParserForPart:1;
@ -1625,8 +1446,8 @@ Index: sope-mime/NGMime/NGMimePartParser.h
@interface NSObject(NGMimePartParser) @interface NSObject(NGMimePartParser)
Index: sope-mime/NGMime/NGMimePartParser.m Index: sope-mime/NGMime/NGMimePartParser.m
=================================================================== ===================================================================
--- sope-mime/NGMime/NGMimePartParser.m (révision 1626) --- sope-mime/NGMime/NGMimePartParser.m (revision 1626)
+++ sope-mime/NGMime/NGMimePartParser.m (copie de travail) +++ sope-mime/NGMime/NGMimePartParser.m (working copy)
@@ -227,7 +227,7 @@ @@ -227,7 +227,7 @@
} }
@ -1650,8 +1471,8 @@ Index: sope-mime/NGMime/NGMimePartParser.m
: [NGMimeType mimeType:[ctype stringValue]]; : [NGMimeType mimeType:[ctype stringValue]];
Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m
=================================================================== ===================================================================
--- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (révision 1626) --- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (revision 1626)
+++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (copie de travail) +++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (working copy)
@@ -105,10 +105,10 @@ @@ -105,10 +105,10 @@
} }
@ -1733,8 +1554,8 @@ Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m
Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m
=================================================================== ===================================================================
--- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (révision 1626) --- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (revision 1626)
+++ sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (copie de travail) +++ sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (working copy)
@@ -49,80 +49,70 @@ @@ -49,80 +49,70 @@
// TODO: move the stuff below to some NSString or NSData category? // TODO: move the stuff below to some NSString or NSData category?
@ -1867,10 +1688,197 @@ Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m
} }
return data; return data;
} }
Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
===================================================================
--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (revision 1626)
+++ 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 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 (revision 1626)
+++ 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];
@@ -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 (revision 1626)
+++ 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/NGExtensions/NSString+Ext.h Index: sope-core/NGExtensions/NGExtensions/NSString+Ext.h
=================================================================== ===================================================================
--- sope-core/NGExtensions/NGExtensions/NSString+Ext.h (révision 1626) --- sope-core/NGExtensions/NGExtensions/NSString+Ext.h (revision 1626)
+++ sope-core/NGExtensions/NGExtensions/NSString+Ext.h (copie de travail) +++ sope-core/NGExtensions/NGExtensions/NSString+Ext.h (working copy)
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
@interface NSString(GSAdditions) @interface NSString(GSAdditions)
@ -1907,8 +1915,8 @@ Index: sope-core/NGExtensions/NGExtensions/NSString+Ext.h
/* specific to libFoundation */ /* specific to libFoundation */
Index: sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m Index: sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m
=================================================================== ===================================================================
--- sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (révision 1626) --- sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (revision 1626)
+++ sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (copie de travail) +++ sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (working copy)
@@ -39,18 +39,6 @@ @@ -39,18 +39,6 @@
: (NSString *)[[self copy] autorelease]; : (NSString *)[[self copy] autorelease];
} }
@ -1996,8 +2004,8 @@ Index: sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m
- (BOOL)isAbsoluteURL - (BOOL)isAbsoluteURL
Index: sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m Index: sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m
=================================================================== ===================================================================
--- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (révision 1626) --- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (revision 1626)
+++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (copie de travail) +++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (working copy)
@@ -140,8 +140,12 @@ @@ -140,8 +140,12 @@
@ -2039,8 +2047,8 @@ Index: sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m
static char *iconv_wrapper(id self, char *_src, unsigned _srcLen, static char *iconv_wrapper(id self, char *_src, unsigned _srcLen,
Index: sope-core/NGExtensions/NGQuotedPrintableCoding.m Index: sope-core/NGExtensions/NGQuotedPrintableCoding.m
=================================================================== ===================================================================
--- sope-core/NGExtensions/NGQuotedPrintableCoding.m (révision 1626) --- sope-core/NGExtensions/NGQuotedPrintableCoding.m (revision 1626)
+++ sope-core/NGExtensions/NGQuotedPrintableCoding.m (copie de travail) +++ sope-core/NGExtensions/NGQuotedPrintableCoding.m (working copy)
@@ -278,7 +278,12 @@ @@ -278,7 +278,12 @@
for (cnt = 0; (cnt < _srcLen) && (destCnt < _destLen); cnt++) { for (cnt = 0; (cnt < _srcLen) && (destCnt < _destLen); cnt++) {
@ -2057,8 +2065,8 @@ Index: sope-core/NGExtensions/NGQuotedPrintableCoding.m
((c > 31) && (c < 61)) || ((c > 31) && (c < 61)) ||
Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m
=================================================================== ===================================================================
--- sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (révision 1626) --- sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (revision 1626)
+++ sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (copie de travail) +++ sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (working copy)
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
02111-1307, USA. 02111-1307, USA.
*/ */
@ -2069,8 +2077,8 @@ Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m
Index: sope-core/NGStreams/GNUmakefile.preamble Index: sope-core/NGStreams/GNUmakefile.preamble
=================================================================== ===================================================================
--- sope-core/NGStreams/GNUmakefile.preamble (révision 1626) --- sope-core/NGStreams/GNUmakefile.preamble (revision 1626)
+++ sope-core/NGStreams/GNUmakefile.preamble (copie de travail) +++ sope-core/NGStreams/GNUmakefile.preamble (working copy)
@@ -1,7 +1,10 @@ @@ -1,7 +1,10 @@
# compilation settings # compilation settings
@ -2084,8 +2092,8 @@ Index: sope-core/NGStreams/GNUmakefile.preamble
-I.. -I..
Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h
=================================================================== ===================================================================
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (révision 1626) --- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (revision 1626)
+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (copie de travail) +++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (working copy)
@@ -19,6 +19,8 @@ @@ -19,6 +19,8 @@
02111-1307, USA. 02111-1307, USA.
*/ */
@ -2106,8 +2114,8 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h
id<NSObject,SaxEntityResolver> entityResolver; id<NSObject,SaxEntityResolver> entityResolver;
Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m
=================================================================== ===================================================================
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (révision 1626) --- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (revision 1626)
+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (copie de travail) +++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (working copy)
@@ -30,6 +30,12 @@ @@ -30,6 +30,12 @@
#include <libxml/HTMLparser.h> #include <libxml/HTMLparser.h>
#include <libxml/HTMLtree.h> #include <libxml/HTMLtree.h>
@ -2166,8 +2174,8 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m
- (void)tearDownParser { - (void)tearDownParser {
Index: sope-xml/libxmlSAXDriver/libxmlSAXDriver.m Index: sope-xml/libxmlSAXDriver/libxmlSAXDriver.m
=================================================================== ===================================================================
--- sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (révision 1626) --- sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (revision 1626)
+++ sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (copie de travail) +++ sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (working copy)
@@ -614,7 +614,7 @@ @@ -614,7 +614,7 @@
xmlParseDocument(ctxt); xmlParseDocument(ctxt);
@ -2188,8 +2196,8 @@ Index: sope-xml/libxmlSAXDriver/libxmlSAXDriver.m
xmlFreeParserCtxt(self->ctxt); xmlFreeParserCtxt(self->ctxt);
Index: sope-appserver/mod_ngobjweb/config.c Index: sope-appserver/mod_ngobjweb/config.c
=================================================================== ===================================================================
--- sope-appserver/mod_ngobjweb/config.c (révision 1626) --- sope-appserver/mod_ngobjweb/config.c (revision 1626)
+++ sope-appserver/mod_ngobjweb/config.c (copie de travail) +++ sope-appserver/mod_ngobjweb/config.c (working copy)
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
#include "common.h" #include "common.h"
@ -2199,10 +2207,22 @@ Index: sope-appserver/mod_ngobjweb/config.c
static char *_makeString(char *buf, char *str, int max) { static char *_makeString(char *buf, char *str, int max) {
if (buf == NULL) if (buf == NULL)
Index: sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c
===================================================================
--- sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (revision 1626)
+++ sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (working copy)
@@ -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 Index: sope-appserver/mod_ngobjweb/GNUmakefile
=================================================================== ===================================================================
--- sope-appserver/mod_ngobjweb/GNUmakefile (révision 1626) --- sope-appserver/mod_ngobjweb/GNUmakefile (revision 1626)
+++ sope-appserver/mod_ngobjweb/GNUmakefile (copie de travail) +++ sope-appserver/mod_ngobjweb/GNUmakefile (working copy)
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
CFLAGS = -Wall -I. -fPIC \ CFLAGS = -Wall -I. -fPIC \
@ -2222,22 +2242,10 @@ Index: sope-appserver/mod_ngobjweb/GNUmakefile
install-usr-libexec :: all install-usr-libexec :: all
$(INSTALL_PROGRAM) $(product) /usr/libexec/httpd/ $(INSTALL_PROGRAM) $(product) /usr/libexec/httpd/
Index: sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c
===================================================================
--- sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (révision 1626)
+++ 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 Index: sope-appserver/NGObjWeb/GNUmakefile.postamble
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/GNUmakefile.postamble (révision 1626) --- sope-appserver/NGObjWeb/GNUmakefile.postamble (revision 1626)
+++ sope-appserver/NGObjWeb/GNUmakefile.postamble (copie de travail) +++ sope-appserver/NGObjWeb/GNUmakefile.postamble (working copy)
@@ -23,14 +23,20 @@ @@ -23,14 +23,20 @@
# install makefiles # install makefiles
@ -2268,8 +2276,8 @@ Index: sope-appserver/NGObjWeb/GNUmakefile.postamble
+ $(DESTDIR)/$(GNUSTEP_MAKEFILES)/wobundle.make + $(DESTDIR)/$(GNUSTEP_MAKEFILES)/wobundle.make
Index: sope-appserver/NGObjWeb/WOContext.m Index: sope-appserver/NGObjWeb/WOContext.m
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/WOContext.m (révision 1626) --- sope-appserver/NGObjWeb/WOContext.m (revision 1626)
+++ sope-appserver/NGObjWeb/WOContext.m (copie de travail) +++ sope-appserver/NGObjWeb/WOContext.m (working copy)
@@ -64,11 +64,13 @@ @@ -64,11 +64,13 @@
static BOOL testNSURLs = NO; static BOOL testNSURLs = NO;
static BOOL newCURLStyle = NO; static BOOL newCURLStyle = NO;
@ -2308,8 +2316,8 @@ Index: sope-appserver/NGObjWeb/WOContext.m
serverURL = [@"http://" stringByAppendingString:host]; serverURL = [@"http://" stringByAppendingString:host];
Index: sope-appserver/NGObjWeb/DAVPropMap.plist Index: sope-appserver/NGObjWeb/DAVPropMap.plist
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/DAVPropMap.plist (révision 1626) --- sope-appserver/NGObjWeb/DAVPropMap.plist (revision 1626)
+++ sope-appserver/NGObjWeb/DAVPropMap.plist (copie de travail) +++ sope-appserver/NGObjWeb/DAVPropMap.plist (working copy)
@@ -24,13 +24,19 @@ @@ -24,13 +24,19 @@
"{DAV:}status" = "davStatus"; "{DAV:}status" = "davStatus";
"{http://apache.org/dav/props/}executable" = "davIsExecutable"; "{http://apache.org/dav/props/}executable" = "davIsExecutable";
@ -2386,8 +2394,8 @@ Index: sope-appserver/NGObjWeb/DAVPropMap.plist
"{http://groupdav.org/}component-set" = gdavComponentSet; "{http://groupdav.org/}component-set" = gdavComponentSet;
Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (révision 1626) --- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (revision 1626)
+++ sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (copie de travail) +++ sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (working copy)
@@ -655,6 +655,7 @@ @@ -655,6 +655,7 @@
if (self->responses == nil) if (self->responses == nil)
self->responses = [[NSMutableArray alloc] initWithCapacity:64]; self->responses = [[NSMutableArray alloc] initWithCapacity:64];
@ -2398,8 +2406,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m
case 'n': case 'n':
Index: sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m Index: sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (révision 1626) --- sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (revision 1626)
+++ sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (copie de travail) +++ sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (working copy)
@@ -1523,16 +1523,16 @@ @@ -1523,16 +1523,16 @@
- (id)doREPORT:(WOContext *)_ctx { - (id)doREPORT:(WOContext *)_ctx {
id<DOMDocument> domDocument; id<DOMDocument> domDocument;
@ -2486,8 +2494,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m
/* DAV access control lists */ /* DAV access control lists */
Index: sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m Index: sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (révision 1626) --- sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (revision 1626)
+++ sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (copie de travail) +++ sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (working copy)
@@ -277,7 +277,8 @@ @@ -277,7 +277,8 @@
ok = [self renderLockToken:_object inContext:_ctx]; ok = [self renderLockToken:_object inContext:_ctx];
break; break;
@ -2500,8 +2508,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
ok = [self renderStatusResult:_object ok = [self renderStatusResult:_object
Index: sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h Index: sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (révision 1626) --- sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (revision 1626)
+++ sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (copie de travail) +++ sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (working copy)
@@ -62,6 +62,7 @@ @@ -62,6 +62,7 @@
properties:(NSDictionary *)_props properties:(NSDictionary *)_props
inContext:(id)_ctx; inContext:(id)_ctx;
@ -2512,8 +2520,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h
inContext:(id)_ctx; inContext:(id)_ctx;
Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (révision 1626) --- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (revision 1626)
+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (copie de travail) +++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (working copy)
@@ -216,6 +216,12 @@ @@ -216,6 +216,12 @@
assocCount++; assocCount++;
} }
@ -2529,8 +2537,8 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (révision 1626) --- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (revision 1626)
+++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (copie de travail) +++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (working copy)
@@ -41,6 +41,7 @@ @@ -41,6 +41,7 @@
WOAssociation *string; WOAssociation *string;
WOAssociation *target; WOAssociation *target;
@ -2562,8 +2570,8 @@ Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
return NO; return NO;
Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (révision 1626) --- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (revision 1626)
+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (copie de travail) +++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (working copy)
@@ -41,7 +41,8 @@ @@ -41,7 +41,8 @@
WOAssociation *pageName; WOAssociation *pageName;
WOAssociation *actionClass; WOAssociation *actionClass;
@ -2576,8 +2584,8 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h
/* 'ivar' associations */ /* 'ivar' associations */
Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/SoObjects/SoObject.m (révision 1626) --- sope-appserver/NGObjWeb/SoObjects/SoObject.m (revision 1626)
+++ sope-appserver/NGObjWeb/SoObjects/SoObject.m (copie de travail) +++ sope-appserver/NGObjWeb/SoObjects/SoObject.m (working copy)
@@ -39,22 +39,34 @@ @@ -39,22 +39,34 @@
static int debugLookup = -1; static int debugLookup = -1;
static int debugBaseURL = -1; static int debugBaseURL = -1;
@ -2727,8 +2735,8 @@ Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m
Index: sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m Index: sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (révision 1626) --- sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (revision 1626)
+++ sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (copie de travail) +++ sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (working copy)
@@ -195,7 +195,8 @@ @@ -195,7 +195,8 @@
isCreateIfMissingMethod = YES; isCreateIfMissingMethod = YES;
else if ([m isEqualToString:@"PROPPATCH"]) else if ([m isEqualToString:@"PROPPATCH"])
@ -2741,8 +2749,8 @@ Index: sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m
// TODO: the following are only create-if-missing on the target! // TODO: the following are only create-if-missing on the target!
Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (révision 1626) --- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (revision 1626)
+++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (copie de travail) +++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (working copy)
@@ -32,6 +32,7 @@ @@ -32,6 +32,7 @@
#include <NGObjWeb/WOCookie.h> #include <NGObjWeb/WOCookie.h>
#include <NGExtensions/NSData+gzip.h> #include <NGExtensions/NSData+gzip.h>
@ -2766,8 +2774,8 @@ Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m
@implementation WOCoreApplication(SimpleParserSelection) @implementation WOCoreApplication(SimpleParserSelection)
Index: sope-appserver/NGObjWeb/Defaults.plist Index: sope-appserver/NGObjWeb/Defaults.plist
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/Defaults.plist (révision 1626) --- sope-appserver/NGObjWeb/Defaults.plist (revision 1626)
+++ sope-appserver/NGObjWeb/Defaults.plist (copie de travail) +++ sope-appserver/NGObjWeb/Defaults.plist (working copy)
@@ -216,7 +216,7 @@ @@ -216,7 +216,7 @@
SoWebDAVDisableCrossHostMoveCheck = NO; SoWebDAVDisableCrossHostMoveCheck = NO;
@ -2787,8 +2795,8 @@ Index: sope-appserver/NGObjWeb/Defaults.plist
DELETE, DELETE,
Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (révision 1626) --- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (revision 1626)
+++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (copie de travail) +++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (working copy)
@@ -62,6 +62,10 @@ @@ -62,6 +62,10 @@
/* RFC 3253 (DeltaV) */ /* RFC 3253 (DeltaV) */
NGHttpMethod_REPORT, NGHttpMethod_REPORT,
@ -2802,8 +2810,8 @@ Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h
Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (révision 1626) --- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (revision 1626)
+++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (copie de travail) +++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (working copy)
@@ -59,6 +59,10 @@ @@ -59,6 +59,10 @@
/* RFC 3253 (DeltaV) */ /* RFC 3253 (DeltaV) */
@"REPORT", @"REPORT",