-Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
-===================================================================
---- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (révision 1608)
-+++ 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 1608)
-+++ 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 1608)
-+++ 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 1608)
+--- sope-mime/NGImap4/NGImap4Connection.m (révision 1618)
+++ sope-mime/NGImap4/NGImap4Connection.m (copie de travail)
@@ -381,7 +381,7 @@
[self errorWithFormat:@"Could not list mailbox hierarchy!"];
Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m
===================================================================
---- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (révision 1608)
+--- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (révision 1618)
+++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m (copie de travail)
@@ -648,14 +648,13 @@
enumerator = [_flags objectEnumerator];
if (objs) free(objs);
Index: sope-mime/NGImap4/NGImap4ResponseParser.m
===================================================================
---- sope-mime/NGImap4/NGImap4ResponseParser.m (révision 1608)
+--- sope-mime/NGImap4/NGImap4ResponseParser.m (révision 1618)
+++ sope-mime/NGImap4/NGImap4ResponseParser.m (copie de travail)
@@ -84,6 +84,8 @@
static NSDictionary *_parseMultipartBody(NGImap4ResponseParser *self,
{
Index: sope-mime/NGMail/NGSmtpClient.m
===================================================================
---- sope-mime/NGMail/NGSmtpClient.m (révision 1608)
+--- sope-mime/NGMail/NGSmtpClient.m (révision 1618)
+++ sope-mime/NGMail/NGSmtpClient.m (copie de travail)
@@ -24,6 +24,82 @@
#include "NGSmtpReplyCodes.h"
reply = [self receiveReply];
Index: sope-mime/NGMail/NGMimeMessageGenerator.m
===================================================================
---- sope-mime/NGMail/NGMimeMessageGenerator.m (révision 1608)
+--- sope-mime/NGMail/NGMimeMessageGenerator.m (révision 1618)
+++ sope-mime/NGMail/NGMimeMessageGenerator.m (copie de travail)
@@ -86,37 +86,40 @@
char *des = NULL;
unsigned isoEndLen = 2;
Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m
===================================================================
---- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (révision 1608)
+--- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (révision 1618)
+++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (copie de travail)
@@ -19,88 +19,45 @@
02111-1307, USA.
#if 0
Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m
===================================================================
---- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (révision 1608)
+--- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (révision 1618)
+++ sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (copie de travail)
@@ -77,6 +77,7 @@
[rfc822Set setGenerator:gen forField:@"bcc"];
Index: sope-mime/NGMime/NGMimeBodyPart.m
===================================================================
---- sope-mime/NGMime/NGMimeBodyPart.m (révision 1608)
+--- sope-mime/NGMime/NGMimeBodyPart.m (révision 1618)
+++ sope-mime/NGMime/NGMimeBodyPart.m (copie de travail)
@@ -31,18 +31,6 @@
return 2;
- (NSString *)contentId {
Index: sope-mime/NGMime/GNUmakefile.preamble
===================================================================
---- sope-mime/NGMime/GNUmakefile.preamble (révision 1608)
+--- sope-mime/NGMime/GNUmakefile.preamble (révision 1618)
+++ sope-mime/NGMime/GNUmakefile.preamble (copie de travail)
@@ -5,6 +5,11 @@
-DLIBRARY_MINOR_VERSION=${MINOR_VERSION} \
-I../../sope-core/NGStreams/ \
Index: sope-mime/NGMime/NGMimeBodyParser.m
===================================================================
---- sope-mime/NGMime/NGMimeBodyParser.m (révision 1608)
+--- sope-mime/NGMime/NGMimeBodyParser.m (révision 1618)
+++ sope-mime/NGMime/NGMimeBodyParser.m (copie de travail)
@@ -67,7 +67,10 @@
if (_data == nil) return nil;
Index: sope-mime/NGMime/NGMimePartParser.h
===================================================================
---- sope-mime/NGMime/NGMimePartParser.h (révision 1608)
+--- sope-mime/NGMime/NGMimePartParser.h (révision 1618)
+++ sope-mime/NGMime/NGMimePartParser.h (copie de travail)
@@ -117,6 +117,7 @@
BOOL parserParseRawBodyDataOfPart:1;
@interface NSObject(NGMimePartParser)
Index: sope-mime/NGMime/NGMimePartParser.m
===================================================================
---- sope-mime/NGMime/NGMimePartParser.m (révision 1608)
+--- sope-mime/NGMime/NGMimePartParser.m (révision 1618)
+++ sope-mime/NGMime/NGMimePartParser.m (copie de travail)
@@ -227,7 +227,7 @@
}
: [NGMimeType mimeType:[ctype stringValue]];
Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m
===================================================================
---- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (révision 1608)
+--- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (révision 1618)
+++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (copie de travail)
@@ -130,8 +130,13 @@
bufLen = [data length];
Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m
===================================================================
---- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (révision 1608)
+--- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (révision 1618)
+++ sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (copie de travail)
@@ -49,80 +49,70 @@
}
return data;
}
+Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
+===================================================================
+--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (révision 1618)
++++ 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 1618)
++++ 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 1618)
++++ 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/FdExt.subproj/NSString+Encoding.m
===================================================================
---- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (révision 1608)
+--- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (révision 1618)
+++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (copie de travail)
@@ -140,8 +140,12 @@
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 1608)
+--- sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (révision 1618)
+++ sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (copie de travail)
@@ -19,6 +19,7 @@
02111-1307, USA.
Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h
===================================================================
---- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (révision 1608)
+--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (révision 1618)
+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (copie de travail)
@@ -19,6 +19,8 @@
02111-1307, USA.
id<NSObject,SaxEntityResolver> entityResolver;
Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m
===================================================================
---- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (révision 1608)
+--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (révision 1618)
+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (copie de travail)
@@ -30,6 +30,12 @@
#include <libxml/HTMLparser.h>
- (void)tearDownParser {
Index: sope-appserver/mod_ngobjweb/config.c
===================================================================
---- sope-appserver/mod_ngobjweb/config.c (révision 1608)
+--- sope-appserver/mod_ngobjweb/config.c (révision 1618)
+++ sope-appserver/mod_ngobjweb/config.c (copie de travail)
@@ -21,7 +21,7 @@
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 1618)
++++ 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 1608)
+--- sope-appserver/mod_ngobjweb/GNUmakefile (révision 1618)
+++ sope-appserver/mod_ngobjweb/GNUmakefile (copie de travail)
@@ -81,7 +81,7 @@
LDFLAGS = $(APXS_LDFLAGS) $(APR_LDFLAGS) -shared -fPIC
-Index: sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c
-===================================================================
---- sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (révision 1608)
-+++ 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/handler.c
===================================================================
---- sope-appserver/mod_ngobjweb/handler.c (révision 1608)
+--- sope-appserver/mod_ngobjweb/handler.c (révision 1618)
+++ sope-appserver/mod_ngobjweb/handler.c (copie de travail)
@@ -267,7 +267,7 @@
const char *uri;
static void test(void) {
Index: sope-appserver/NGObjWeb/GNUmakefile.postamble
===================================================================
---- sope-appserver/NGObjWeb/GNUmakefile.postamble (révision 1608)
+--- sope-appserver/NGObjWeb/GNUmakefile.postamble (révision 1618)
+++ sope-appserver/NGObjWeb/GNUmakefile.postamble (copie de travail)
@@ -23,14 +23,20 @@
+ $(DESTDIR)/$(GNUSTEP_MAKEFILES)/wobundle.make
Index: sope-appserver/NGObjWeb/WOContext.m
===================================================================
---- sope-appserver/NGObjWeb/WOContext.m (révision 1608)
+--- sope-appserver/NGObjWeb/WOContext.m (révision 1618)
+++ sope-appserver/NGObjWeb/WOContext.m (copie de travail)
@@ -64,11 +64,13 @@
static BOOL testNSURLs = NO;
serverURL = [@"http://" stringByAppendingString:host];
Index: sope-appserver/NGObjWeb/DAVPropMap.plist
===================================================================
---- sope-appserver/NGObjWeb/DAVPropMap.plist (révision 1608)
+--- sope-appserver/NGObjWeb/DAVPropMap.plist (révision 1618)
+++ sope-appserver/NGObjWeb/DAVPropMap.plist (copie de travail)
-@@ -123,11 +123,14 @@
+@@ -120,17 +120,21 @@
+ "{http://ucb.openoffice.org/dav/props/}IsRemoveable" = isOOoRemoveable;
+ "{http://ucb.openoffice.org/dav/props/}IsVolume" = isOOoVolume;
+ "{http://ucb.openoffice.org/dav/props/}TargetURL" = davOOoTargetURL;
+-
++
+ /* WebDAV ACL */
+ "{DAV:}current-user-privilege-set" = davCurrentUserPrivilegeSet;
/* CalDAV */
++ "{urn:ietf:params:xml:ns:caldav}calendar-data" = davCalendarData;
++ "{urn:ietf:params:xml:ns:caldav}calendar-description" = davDescription;
"{urn:ietf:params:xml:ns:caldav}calendar-home-set" = davCalendarHomeSet;
+ "{urn:ietf:params:xml:ns:caldav}calendar-user-address-set" = davCalendarUserAddressSet;
+ "{urn:ietf:params:xml:ns:caldav}schedule-inbox-URL" = davCalendarScheduleInboxURL;
+ "{urn:ietf:params:xml:ns:caldav}schedule-outbox-URL" = davCalendarScheduleOutboxURL;
-
- /* Apple CalServer */
-- "{http://apple.com/ns/calendarserver/}dropbox-home-URL" =
-+ "{http://calendarserver.org/ns/}dropbox-home-URL" =
- davDropboxHomeURL;
-- "{http://apple.com/ns/calendarserver/}notifications-URL" =
-+ "{http://calendarserver.org/ns/}notifications-URL" =
- davNotificationsURL;
- "{com.apple.ical:}calendarcolor" = davCalendarColor;
- }
+ "{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set" =
+ davCalendarComponentSet;
+ "{urn:ietf:params:xml:ns:caldav}supported-calendar-data" =
+ davSupportedCalendarDataTypes;
+- "{urn:ietf:params:xml:ns:caldav}calendar-description" = davDescription;
+
+ /* CardDAV */
+ "{urn:ietf:params:xml:ns:carddav}supported-address-data" =
Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m
===================================================================
---- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (révision 1608)
+--- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (révision 1618)
+++ sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (copie de travail)
@@ -655,6 +655,7 @@
if (self->responses == nil)
case 'n':
Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
===================================================================
---- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (révision 1608)
+--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (révision 1618)
+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (copie de travail)
@@ -216,6 +216,12 @@
assocCount++;
Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
===================================================================
---- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (révision 1608)
+--- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (révision 1618)
+++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (copie de travail)
@@ -41,6 +41,7 @@
WOAssociation *string;
return NO;
Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h
===================================================================
---- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (révision 1608)
+--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (révision 1618)
+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (copie de travail)
@@ -41,7 +41,8 @@
WOAssociation *pageName;
/* 'ivar' associations */
Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m
===================================================================
---- sope-appserver/NGObjWeb/SoObjects/SoObject.m (révision 1608)
+--- sope-appserver/NGObjWeb/SoObjects/SoObject.m (révision 1618)
+++ sope-appserver/NGObjWeb/SoObjects/SoObject.m (copie de travail)
@@ -39,22 +39,34 @@
static int debugLookup = -1;
Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m
===================================================================
---- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (révision 1608)
+--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (révision 1618)
+++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (copie de travail)
-@@ -31,6 +31,7 @@
+@@ -32,6 +32,7 @@
#include <NGObjWeb/WOCookie.h>
#include <NGExtensions/NSData+gzip.h>
#include <NGHttp/NGHttp.h>
#include "common.h"
#include <string.h>
-@@ -1016,6 +1017,12 @@
+@@ -1042,6 +1043,12 @@
- (void)parser:(NGMimePartParser *)_parser didParseHeader:(NGHashMap *)_header {
}
#import <Foundation/NSCalendarDate.h>
#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSURL.h>
#import <Foundation/NSUserDefaults.h>
#import <Foundation/NSValue.h>
/* name lookup */
-- (void) appendObject: (NSDictionary *) object
- withBaseURL: (NSString *) baseURL
- toREPORTResponse: (WOResponse *) r
+- (void) _appendPropstat: (NSDictionary *) propstat
+ toResponse: (WOResponse *) r
+{
+ NSArray *properties;
+ unsigned int count, max;
+
+ [r appendContentString: @"<D:propstat>"];
+ [r appendContentString: @"<D:prop>"];
+ properties = [propstat objectForKey: @"properties"];
+ max = [properties count];
+ for (count = 0; count < max; count++)
+ [r appendContentString: [properties objectAtIndex: count]];
+ [r appendContentString: @"</D:prop>"];
+ [r appendContentString: @"<D:status>"];
+ [r appendContentString: [propstat objectForKey: @"status"]];
+ [r appendContentString: @"</D:status>"];
+ [r appendContentString: @"</D:propstat>"];
+}
+
+#warning we should use the EOFetchSpecification for that!!! (see doPROPFIND:)
+
+#warning components in calendar-data query are ignored
+- (NSString *) _property: (NSObject <DOMElement> *) property
+ ofObject: (SOGoObject *) sogoObject
+{
+ NSDictionary *map;
+ NSString *value, *propName, *methodName;
+ SEL methodSel;
+
+ value = nil;
+
+ propName = [NSString stringWithFormat: @"{%@}%@",
+ [property namespaceURI],
+ [property nodeName]];
+ map = [[self class] defaultWebDAVAttributeMap];
+ methodName = [map objectForKey: propName];
+ if (methodName)
+ {
+ methodSel = NSSelectorFromString(methodName);
+ if ([sogoObject respondsToSelector: methodSel])
+ {
+ value = [[sogoObject performSelector: methodSel]
+ stringByEscapingXMLString];
+ if (![value length])
+ NSLog (@"value empty?");
+ }
+ }
+
+ return value;
+}
+
+- (NSString *) _namespaceRep: (NSString *) namespace
+{
+ NSString *rep;
+
+ if ([namespace isEqualToString: @"urn:ietf:params:xml:ns:caldav"])
+ rep = @"C";
+ else
+ rep = @"D";
+
+ return rep;
+}
+
+- (NSString *) _nodeTag: (NSObject <DOMElement> *) property
+{
+ NSMutableString *nodeTag;
+ NSString *nsRep;
+
+ nodeTag = [NSMutableString string];
+ nsRep = [self _namespaceRep: [property namespaceURI]];
+ if (nsRep)
+ [nodeTag appendFormat: @"%@:", nsRep];
+ [nodeTag appendString: [property nodeName]];
+
+ return nodeTag;
+}
+
+- (NSString *) _representProperty: (NSDictionary *) property
+{
+ NSMutableString *propertyValue;
+ NSString *content, *nodeTag;
+
+ propertyValue = [NSMutableString string];
+ nodeTag = [self _nodeTag: [property objectForKey: @"property"]];
+ content = [property objectForKey: @"content"];
+ if (content)
+ [propertyValue appendFormat: @"<%@>%@</%@>", nodeTag, content, nodeTag];
+ else
+ [propertyValue appendFormat: @"<%@/>", nodeTag];
+
+ return propertyValue;
+}
+
+- (NSArray *) _properties: (NSArray *) properties
+ ofObject: (NSDictionary *) object
{
- SOGoCalendarComponent *component;
- Class componentClass;
- NSString *name, *etagLine, *calString;
+ NSMutableArray *values;
+ NSEnumerator *list;
+ NSObject <DOMElement> *currentProperty;
+ NSMutableDictionary *currentValue;
+ SOGoObject *sogoObject;
+ NSString *content;
+
+ values = [NSMutableArray array];
+
+ sogoObject = [self lookupName: [object objectForKey: @"c_name"]
+ inContext: context
+ acquire: NO];
+ list = [properties objectEnumerator];
+ while ((currentProperty = [list nextObject]))
+ {
+ currentValue = [NSMutableDictionary dictionary];
+ [currentValue setObject: currentProperty
+ forKey: @"property"];
+ content = [self _property: currentProperty
+ ofObject: sogoObject];
+ if (content)
+ [currentValue setObject: content
+ forKey: @"content"];
+ [values addObject: currentValue];
+ }
- name = [object objectForKey: @"c_name"];
+ return values;
+}
+
+- (NSArray *) _propstats: (NSArray *) properties
+ ofObject: (NSDictionary *) object
+{
+ NSMutableArray *propstats, *properties200, *properties404;
+ NSEnumerator *values;
+ NSDictionary *currentProperty;
+ NSString *content, *propertyValue;
+
+ propstats = [NSMutableArray array];
+
+ properties200 = [NSMutableArray new];
+ properties404 = [NSMutableArray new];
+
+ values = [[self _properties: properties ofObject: object]
+ objectEnumerator];
+ while ((currentProperty = [values nextObject]))
+ {
+ content = [currentProperty objectForKey: @"content"];
+ propertyValue = [self _representProperty: currentProperty];
+ if (content)
+ [properties200 addObject: propertyValue];
+ else
+ [properties404 addObject: propertyValue];
+ }
- if ([[object objectForKey: @"c_component"] isEqualToString: @"vevent"])
- componentClass = [SOGoAppointmentObject class];
+ if ([properties200 count])
+ {
+ [propstats addObject: [NSDictionary dictionaryWithObjectsAndKeys:
+ properties200, @"properties",
+ @"HTTP/1.1 200 OK", @"status",
+ nil]];
+ [properties200 autorelease];
+ }
+ else
+ [properties200 release];
+
+ if ([properties404 count])
+ {
+ [propstats addObject: [NSDictionary dictionaryWithObjectsAndKeys:
+ properties404, @"properties",
+ @"HTTP/1.1 404 Not Found", @"status",
+ nil]];
+ [properties404 autorelease];
+ }
else
- componentClass = [SOGoTaskObject class];
+ [properties404 release];
- component = [componentClass objectWithName: name inContainer: self];
+ return propstats;
+}
+
+- (void) appendObject: (NSDictionary *) object
+ properties: (NSArray *) properties
+ withBaseURL: (NSString *) baseURL
+ toComplexResponse: (WOResponse *) r
+{
+ NSEnumerator *propstats;
+ NSDictionary *propstat;
[r appendContentString: @" <D:response>\r\n"];
[r appendContentString: @" <D:href>"];
[r appendContentString: baseURL];
if (![baseURL hasSuffix: @"/"])
[r appendContentString: @"/"];
- [r appendContentString: name];
+ [r appendContentString: [object objectForKey: @"c_name"]];
[r appendContentString: @"</D:href>\r\n"];
- [r appendContentString: @" <D:propstat>\r\n"];
- [r appendContentString: @" <D:prop>\r\n"];
- etagLine = [NSString stringWithFormat: @" <D:getetag>%@</D:getetag>\r\n",
- [component davEntityTag]];
- [r appendContentString: etagLine];
- [r appendContentString: @" </D:prop>\r\n"];
- [r appendContentString: @" <D:status>HTTP/1.1 200 OK</D:status>\r\n"];
- [r appendContentString: @" </D:propstat>\r\n"];
- [r appendContentString: @" <C:calendar-data>"];
- calString = [[component contentAsString] stringByEscapingXMLString];
- [r appendContentString: calString];
- [r appendContentString: @"</C:calendar-data>\r\n"];
+ propstats = [[self _propstats: properties ofObject: object]
+ objectEnumerator];
+ while ((propstat = [propstats nextObject]))
+ [self _appendPropstat: propstat toResponse: r];
+
+ [r appendContentString: @" </D:response>\r\n"];
+}
+
+- (void) appendMissingObjectRef: (NSString *) href
+ toComplexResponse: (WOResponse *) r
+{
+ [r appendContentString: @" <D:response>\r\n"];
+ [r appendContentString: @" <D:href>"];
+ [r appendContentString: href];
+ [r appendContentString: @"</D:href>\r\n"];
+ [r appendContentString: @" <D:status>HTTP/1.1 404 Not Found</D:status>\r\n"];
[r appendContentString: @" </D:response>\r\n"];
}
- (NSDictionary *) _parseCalendarFilter: (id <DOMElement>) filterElement
{
NSMutableDictionary *filterData;
- id <DOMNode> parentNode;
+ id <DOMElement> parentNode;
id <DOMNodeList> ranges;
NSString *componentName;
- parentNode = [filterElement parentNode];
+ parentNode = (id <DOMElement>) [filterElement parentNode];
if ([[parentNode tagName] isEqualToString: @"comp-filter"]
&& [[parentNode attribute: @"name"] isEqualToString: @"VCALENDAR"])
{
[filterData autorelease];
[filterData setObject: componentName forKey: @"name"];
ranges = [filterElement getElementsByTagName: @"time-range"];
- if ([ranges count])
+ if ([ranges length])
[self _appendTimeRange: [ranges objectAtIndex: 0]
toFilter: filterData];
}
return filterData;
}
+- (NSArray *) _parseRequestedProperties: (id <DOMElement>) parentNode
+{
+ NSMutableArray *properties;
+ NSObject <DOMNodeList> *propList, *children;
+ NSObject <DOMNode> *currentChild;
+ unsigned int count, max, count2, max2;
+
+ properties = [NSMutableArray array];
+
+ propList = [parentNode getElementsByTagName: @"prop"];
+ max = [propList length];
+ for (count = 0; count < max; count++)
+ {
+ children = [[propList objectAtIndex: count] childNodes];
+ max2 = [children length];
+ for (count2 = 0; count2 < max2; count2++)
+ {
+ currentChild = [children objectAtIndex: count2];
+ if ([currentChild conformsToProtocol: @protocol(DOMElement)])
+ [properties addObject: currentChild];
+ }
+
+// while ([children hasChildNodes])
+// [properties addObject: [children next]];
+ }
+
+ return properties;
+}
+
- (NSArray *) _parseCalendarFilters: (id <DOMElement>) parentNode
{
- NSEnumerator *children;
- id<DOMElement> node;
+ id <DOMNodeList> children;
+ id <DOMElement> node;
NSMutableArray *filters;
NSDictionary *filter;
+ unsigned int count, max;
filters = [NSMutableArray array];
- children = [[parentNode getElementsByTagName: @"comp-filter"]
- objectEnumerator];
- node = [children nextObject];
- while (node)
+ children = [parentNode getElementsByTagName: @"comp-filter"];
+ max = [children length];
+ for (count = 0; count < max; count++)
{
+ node = [children objectAtIndex: count];
filter = [self _parseCalendarFilter: node];
if (filter)
- [filters addObject: filter];
- node = [children nextObject];
+ [filters addObject: filter];
}
return filters;
}
-- (void) _appendComponentsMatchingFilters: (NSArray *) filters
- toResponse: (WOResponse *) response
+- (void) _appendComponentProperties: (NSArray *) properties
+ matchingFilters: (NSArray *) filters
+ toResponse: (WOResponse *) response
{
NSArray *apts;
unsigned int count, max;
while (appointment)
{
[self appendObject: appointment
+ properties: properties
withBaseURL: baseURL
- toREPORTResponse: response];
+ toComplexResponse: response];
appointment = [appointments nextObject];
}
}
}
+#warning this is baddddd because we return a single-valued dictionary containing \
+ a cname which may not event exist... the logic behind appendObject:... should be \
+ rethought, especially since we may start using SQL views
+
+- (NSDictionary *) _componentMatchingURL: (NSString *) url
+ inBaseURL: (NSString *) baseURL
+{
+ NSDictionary *component;
+ NSURL *componentURL, *realBaseURL;
+ NSArray *urlComponents;
+ NSString *componentURLPath, *cName;
+
+ component = nil;
+
+ realBaseURL = [NSURL URLWithString: baseURL];
+ componentURL = [[NSURL URLWithString: url
+ relativeToURL: realBaseURL]
+ standardizedURL];
+ componentURLPath = [componentURL absoluteString];
+ if ([componentURLPath rangeOfString: [realBaseURL absoluteString]].location
+ != NSNotFound)
+ {
+ urlComponents = [componentURLPath componentsSeparatedByString: @"/"];
+ cName = [urlComponents objectAtIndex: [urlComponents count] - 1];
+ if ([cName isEqualToString: @"2AAC-4E8AB421-1-B767AA80"])
+ NSLog (@"breakpoint...");
+ component = [NSDictionary dictionaryWithObject: cName forKey: @"c_name"];
+ }
+
+ return component;
+}
+
+- (void) _appendComponentProperties: (NSArray *) properties
+ matchingURLs: (id <DOMNodeList>) refs
+ toResponse: (WOResponse *) response
+{
+ NSObject <DOMElement> *element;
+ NSDictionary *currentComponent;
+ NSString *baseURL, *currentURL;
+ unsigned int count, max;
+
+ baseURL = [self baseURLInContext: context];
+
+ max = [refs length];
+ for (count = 0; count < max; count++)
+ {
+ element = [refs objectAtIndex: count];
+ currentURL = [[element firstChild] nodeValue];
+ currentComponent = [self _componentMatchingURL: currentURL
+ inBaseURL: baseURL];
+ if (currentComponent)
+ [self appendObject: currentComponent
+ properties: properties
+ withBaseURL: baseURL
+ toComplexResponse: response];
+ else
+ [self appendMissingObjectRef: currentURL
+ toComplexResponse: response];
+ }
+}
+
- (NSArray *) davNamespaces
{
NSMutableArray *ns;
- (id) davCalendarQuery: (id) queryContext
{
WOResponse *r;
- NSArray *filters;
id <DOMDocument> document;
+ id <DOMElement> documentElement;
+
+ r = [context response];
+ [r setStatus: 207];
+ [r setContentEncoding: NSUTF8StringEncoding];
+ [r setHeader: @"text/xml; charset=\"utf-8\"" forKey: @"content-type"];
+ [r setHeader: @"no-cache" forKey: @"pragma"];
+ [r setHeader: @"no-cache" forKey: @"cache-control"];
+ [r appendContentString:@"<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n"];
+ [r appendContentString: @"<D:multistatus xmlns:D=\"DAV:\""
+ @" xmlns:C=\"urn:ietf:params:xml:ns:caldav\">\r\n"];
+
+ document = [[context request] contentAsDOMDocument];
+ documentElement = [document documentElement];
+ [self _appendComponentProperties: [self _parseRequestedProperties: documentElement]
+ matchingFilters: [self _parseCalendarFilters: documentElement]
+ toResponse: r];
+ [r appendContentString:@"</D:multistatus>\r\n"];
+
+ return r;
+}
+
+- (id) davCalendarMultiget: (id) queryContext
+{
+ WOResponse *r;
+ id <DOMDocument> document;
+ id <DOMElement> documentElement;
r = [context response];
[r setStatus: 207];
@" xmlns:C=\"urn:ietf:params:xml:ns:caldav\">\r\n"];
document = [[context request] contentAsDOMDocument];
- filters = [self _parseCalendarFilters: [document documentElement]];
- [self _appendComponentsMatchingFilters: filters
+ documentElement = [document documentElement];
+ [self _appendComponentProperties: [self _parseRequestedProperties: documentElement]
+ matchingURLs: [documentElement getElementsByTagName: @"href"]
toResponse: r];
[r appendContentString:@"</D:multistatus>\r\n"];
projects / scalable-opengroupware.org / commitdiff