amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-06 08:55:08 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 3d8272cfb7a360effb353f8ed683e96af4d60e6e

Browse Source 
Monotone-Revision: 2062a8955d0e8ef69c5b26a75a2f3aeaacd8142e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-02-05T15:06:49
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-02-05 15:06:49 +00:00
parent fddeb02e3b
commit b1a616b2cb
2 changed files with 178 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SOPE/sope-patchset-r1593.diff → SOPE/sope-patchset-r1597.diff
+172 -166
View File
@@ -1,136 +1,6 @@
Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
===================================================================
--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (révision 1593)
+++ 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 1593)
+++ 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-mime/NGImap4/NGImap4Connection.m
===================================================================
--- sope-mime/NGImap4/NGImap4Connection.m (révision 1593)
--- sope-mime/NGImap4/NGImap4Connection.m (révision 1597)
+++ sope-mime/NGImap4/NGImap4Connection.m (copie de travail)
@@ -381,7 +381,7 @@
@@ -143,7 +13,7 @@ Index: sope-mime/NGImap4/NGImap4Connection.m
[self errorWithFormat:@"Could not list mailbox hierarchy!"];
Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m
===================================================================
--- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (révision 1593)
--- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (révision 1597)
+++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m (copie de travail)
@@ -648,14 +648,13 @@
enumerator = [_flags objectEnumerator];
@@ -169,7 +39,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m
if (objs) free(objs);
Index: sope-mime/NGImap4/NGImap4ResponseParser.m
===================================================================
--- sope-mime/NGImap4/NGImap4ResponseParser.m (révision 1593)
--- sope-mime/NGImap4/NGImap4ResponseParser.m (révision 1597)
+++ sope-mime/NGImap4/NGImap4ResponseParser.m (copie de travail)
@@ -84,6 +84,8 @@
static NSDictionary *_parseMultipartBody(NGImap4ResponseParser *self,
@@ -380,7 +250,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m
{
Index: sope-mime/NGMail/NGSmtpClient.m
===================================================================
--- sope-mime/NGMail/NGSmtpClient.m (révision 1593)
--- sope-mime/NGMail/NGSmtpClient.m (révision 1597)
+++ sope-mime/NGMail/NGSmtpClient.m (copie de travail)
@@ -24,6 +24,82 @@
#include "NGSmtpReplyCodes.h"
@@ -536,7 +406,7 @@ Index: sope-mime/NGMail/NGSmtpClient.m
reply = [self receiveReply];
Index: sope-mime/NGMail/NGMimeMessageGenerator.m
===================================================================
--- sope-mime/NGMail/NGMimeMessageGenerator.m (révision 1593)
--- sope-mime/NGMail/NGMimeMessageGenerator.m (révision 1597)
+++ sope-mime/NGMail/NGMimeMessageGenerator.m (copie de travail)
@@ -86,37 +86,40 @@
char *des = NULL;
@@ -602,7 +472,7 @@ Index: sope-mime/NGMail/NGMimeMessageGenerator.m
unsigned isoEndLen = 2;
Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m
===================================================================
--- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (révision 1593)
--- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (révision 1597)
+++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (copie de travail)
@@ -19,88 +19,45 @@
02111-1307, USA.
@@ -997,7 +867,7 @@ Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m
#if 0
Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m
===================================================================
--- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (révision 1593)
--- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (révision 1597)
+++ sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (copie de travail)
@@ -77,6 +77,7 @@
[rfc822Set setGenerator:gen forField:@"bcc"];
@@ -1009,7 +879,7 @@ Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m
Index: sope-mime/NGMime/NGMimeBodyPart.m
===================================================================
--- sope-mime/NGMime/NGMimeBodyPart.m (révision 1593)
--- sope-mime/NGMime/NGMimeBodyPart.m (révision 1597)
+++ sope-mime/NGMime/NGMimeBodyPart.m (copie de travail)
@@ -31,18 +31,6 @@
return 2;
@@ -1047,7 +917,7 @@ Index: sope-mime/NGMime/NGMimeBodyPart.m
- (NSString *)contentId {
Index: sope-mime/NGMime/GNUmakefile.preamble
===================================================================
--- sope-mime/NGMime/GNUmakefile.preamble (révision 1593)
--- sope-mime/NGMime/GNUmakefile.preamble (révision 1597)
+++ sope-mime/NGMime/GNUmakefile.preamble (copie de travail)
@@ -5,6 +5,11 @@
-DLIBRARY_MINOR_VERSION=${MINOR_VERSION} \
@@ -1063,7 +933,7 @@ Index: sope-mime/NGMime/GNUmakefile.preamble
-I../../sope-core/NGStreams/ \
Index: sope-mime/NGMime/NGMimeBodyParser.m
===================================================================
--- sope-mime/NGMime/NGMimeBodyParser.m (révision 1593)
--- sope-mime/NGMime/NGMimeBodyParser.m (révision 1597)
+++ sope-mime/NGMime/NGMimeBodyParser.m (copie de travail)
@@ -67,7 +67,10 @@
if (_data == nil) return nil;
@@ -1079,7 +949,7 @@ Index: sope-mime/NGMime/NGMimeBodyParser.m
Index: sope-mime/NGMime/NGMimePartParser.h
===================================================================
--- sope-mime/NGMime/NGMimePartParser.h (révision 1593)
--- sope-mime/NGMime/NGMimePartParser.h (révision 1597)
+++ sope-mime/NGMime/NGMimePartParser.h (copie de travail)
@@ -117,6 +117,7 @@
BOOL parserParseRawBodyDataOfPart:1;
@@ -1101,7 +971,7 @@ Index: sope-mime/NGMime/NGMimePartParser.h
@interface NSObject(NGMimePartParser)
Index: sope-mime/NGMime/NGMimePartParser.m
===================================================================
--- sope-mime/NGMime/NGMimePartParser.m (révision 1593)
--- sope-mime/NGMime/NGMimePartParser.m (révision 1597)
+++ sope-mime/NGMime/NGMimePartParser.m (copie de travail)
@@ -227,7 +227,7 @@
}
@@ -1126,7 +996,7 @@ Index: sope-mime/NGMime/NGMimePartParser.m
: [NGMimeType mimeType:[ctype stringValue]];
Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m
===================================================================
--- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (révision 1593)
--- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (révision 1597)
+++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (copie de travail)
@@ -130,8 +130,13 @@
@@ -1157,7 +1027,7 @@ Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m
bufLen = [data length];
Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m
===================================================================
--- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (révision 1593)
--- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (révision 1597)
+++ sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (copie de travail)
@@ -49,80 +49,70 @@
@@ -1291,9 +1161,139 @@ Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m
}
return data;
}
Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
===================================================================
--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (révision 1597)
+++ 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 1597)
+++ 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-core/NGExtensions/FdExt.subproj/NSString+Encoding.m
===================================================================
--- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (révision 1593)
--- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (révision 1597)
+++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (copie de travail)
@@ -140,8 +140,12 @@
@@ -1336,7 +1336,7 @@ Index: sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m
static char *iconv_wrapper(id self, char *_src, unsigned _srcLen,
Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h
===================================================================
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (révision 1593)
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (révision 1597)
+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (copie de travail)
@@ -19,6 +19,8 @@
02111-1307, USA.
@@ -1358,7 +1358,7 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h
id<NSObject,SaxEntityResolver> entityResolver;
Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m
===================================================================
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (révision 1593)
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (révision 1597)
+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (copie de travail)
@@ -30,6 +30,12 @@
#include <libxml/HTMLparser.h>
@@ -1418,7 +1418,7 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m
- (void)tearDownParser {
Index: sope-appserver/mod_ngobjweb/config.c
===================================================================
--- sope-appserver/mod_ngobjweb/config.c (révision 1593)
--- sope-appserver/mod_ngobjweb/config.c (révision 1597)
+++ sope-appserver/mod_ngobjweb/config.c (copie de travail)
@@ -21,7 +21,7 @@
@@ -1431,7 +1431,7 @@ 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 1593)
--- sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (révision 1597)
+++ sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (copie de travail)
@@ -23,6 +23,7 @@
#include <unistd.h>
@@ -1443,7 +1443,7 @@ 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 1593)
--- sope-appserver/mod_ngobjweb/GNUmakefile (révision 1597)
+++ sope-appserver/mod_ngobjweb/GNUmakefile (copie de travail)
@@ -81,7 +81,7 @@
@@ -1456,7 +1456,7 @@ Index: sope-appserver/mod_ngobjweb/GNUmakefile
Index: sope-appserver/mod_ngobjweb/handler.c
===================================================================
--- sope-appserver/mod_ngobjweb/handler.c (révision 1593)
--- sope-appserver/mod_ngobjweb/handler.c (révision 1597)
+++ sope-appserver/mod_ngobjweb/handler.c (copie de travail)
@@ -267,7 +267,7 @@
const char *uri;
@@ -1584,7 +1584,7 @@ Index: sope-appserver/mod_ngobjweb/handler.c
static void test(void) {
Index: sope-appserver/NGObjWeb/GNUmakefile.postamble
===================================================================
--- sope-appserver/NGObjWeb/GNUmakefile.postamble (révision 1593)
--- sope-appserver/NGObjWeb/GNUmakefile.postamble (révision 1597)
+++ sope-appserver/NGObjWeb/GNUmakefile.postamble (copie de travail)
@@ -23,14 +23,20 @@
@@ -1613,7 +1613,7 @@ Index: sope-appserver/NGObjWeb/GNUmakefile.postamble
-endif
Index: sope-appserver/NGObjWeb/WOContext.m
===================================================================
--- sope-appserver/NGObjWeb/WOContext.m (révision 1593)
--- sope-appserver/NGObjWeb/WOContext.m (révision 1597)
+++ sope-appserver/NGObjWeb/WOContext.m (copie de travail)
@@ -64,11 +64,13 @@
static BOOL testNSURLs = NO;
@@ -1653,7 +1653,7 @@ Index: sope-appserver/NGObjWeb/WOContext.m
serverURL = [@"http://" stringByAppendingString:host];
Index: sope-appserver/NGObjWeb/DAVPropMap.plist
===================================================================
--- sope-appserver/NGObjWeb/DAVPropMap.plist (révision 1593)
--- sope-appserver/NGObjWeb/DAVPropMap.plist (révision 1597)
+++ sope-appserver/NGObjWeb/DAVPropMap.plist (copie de travail)
@@ -123,11 +123,14 @@
@@ -1674,7 +1674,7 @@ Index: sope-appserver/NGObjWeb/DAVPropMap.plist
}
Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m
===================================================================
--- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (révision 1593)
--- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (révision 1597)
+++ sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (copie de travail)
@@ -655,6 +655,7 @@
if (self->responses == nil)
@@ -1686,7 +1686,7 @@ Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m
case 'n':
Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
===================================================================
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (révision 1593)
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (révision 1597)
+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (copie de travail)
@@ -216,6 +216,12 @@
assocCount++;
@@ -1703,9 +1703,9 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
===================================================================
--- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (révision 1593)
--- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (révision 1597)
+++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (copie de travail)
@@ -40,6 +40,7 @@
@@ -41,6 +41,7 @@
WOAssociation *string;
WOAssociation *target;
WOAssociation *disabled;
@@ -1713,7 +1713,7 @@ Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
WOElement *template;
/* new in WO4: */
@@ -359,6 +360,7 @@
@@ -360,6 +361,7 @@
{
if ((self = [super initWithName:_name hyperlinkInfo:_info template:_t])) {
self->href = _info->href;
@@ -1721,19 +1721,25 @@ Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
}
return self;
}
@@ -374,6 +376,9 @@
@@ -375,11 +377,14 @@
// TODO: we need a binding to disable rewriting!
NSRange r;
+ if ([[self->isAbsolute valueInContext:_ctx] boolValue] == YES)
+ return NO;
+
r.length = [_s length];
/* do not rewrite pure fragment URLs */
if (r.length > 0 && [_s characterAtIndex:0] == '#')
- return false;
+ return NO;
/* rewrite all URLs w/o a protocol */
r = [_s rangeOfString:@":"];
if (r.length == 0)
return YES;
Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h
===================================================================
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (révision 1593)
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (révision 1597)
+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (copie de travail)
@@ -41,7 +41,8 @@
WOAssociation *pageName;
@@ -1747,7 +1753,7 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h
/* 'ivar' associations */
Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m
===================================================================
--- sope-appserver/NGObjWeb/SoObjects/SoObject.m (révision 1593)
--- sope-appserver/NGObjWeb/SoObjects/SoObject.m (révision 1597)
+++ sope-appserver/NGObjWeb/SoObjects/SoObject.m (copie de travail)
@@ -39,22 +39,34 @@
static int debugLookup = -1;
@@ -1898,7 +1904,7 @@ Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m
Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m
===================================================================
--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (révision 1593)
--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (révision 1597)
+++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (copie de travail)
@@ -31,6 +31,7 @@
#include <NGObjWeb/WOCookie.h>
UI/WebServerResources/UIxMailEditor.js
+6 -5
View File
@@ -278,9 +278,10 @@ function onTextContextMenu(event) {
}
function onTextMouseDown(event) {
log("coucou 1");
event.returnValue = false;
event.cancelBubble = false;
if (event.button == 0) {
event.returnValue = false;
event.cancelBubble = false;
}
}
function initMailEditor() {
@@ -307,8 +308,8 @@ function initMailEditor() {
textarea.scrollTop = textarea.scrollHeight;
textarea.observe("focus", onTextFirstFocus);
textarea.observe("focus", onTextFocus);
textarea.observe("contextmenu", onTextContextMenu);
textarea.observe("mousedown", onTextMouseDown);
// textarea.observe("contextmenu", onTextContextMenu);
textarea.observe("mousedown", onTextMouseDown, true);
onWindowResize(null);
Event.observe(window, "resize", onWindowResize);