amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-28 14:45:28 +00:00
Code Issues Projects Releases Wiki Activity

merge of '2ec967e2199c437328dde8da267393b6e0d4722b'

Browse Source 
and '42c7ffe1a106a44025c36523e969a629541821f7'

Monotone-Parent: 2ec967e2199c437328dde8da267393b6e0d4722b
Monotone-Parent: 42c7ffe1a106a44025c36523e969a629541821f7
Monotone-Revision: 965e5b9c7ec2a2d90948e6cd8a6cb2b4dd7b6159

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-02-14T23:44:59
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2011-02-14 23:44:59 +00:00
parent 9ce08f0f99 86f3455070
commit 95527fda03
6 changed files with 186 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+14
View File
@@ -7,6 +7,20 @@
2011-02-14 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreFSMessageTable.m
(-getChildProperty:forKey:withTag:): move type conversion code
into NSObject+MAPIStore.
* OpenChange/NSObject+MAPIStore.[hm]: new category module that
provides type methods common to all NSObject descendants.
* OpenChange/MAPIStoreContext.m
(-createMessagePropertiesWithMID:inFID:isAssociated:): create a
fake PR_SEARCH_KEY on new message to make Outlook happy when
composing invitations.
(-getProperties:ofTableType:inRow:withMID:): perform property
searches on "live messages" (unsaved ones) as well.
* OpenChange/MAPIStoreMailMessageTable.m (-restrictedChildKeys):
no longer excluded messages marked with "\Deleted".
(-getChildProperty:forKey:withTag:): display the right icon for
OpenChange/GNUmakefile
+1
View File
@@ -82,6 +82,7 @@ $(SOGOBACKEND)_OBJC_FILES += \
NSAutoreleasePool+MAPIStore.m \
NSCalendarDate+MAPIStore.m \
NSData+MAPIStore.m \
NSObject+MAPIStore.m \
NSString+MAPIStore.m \
NSValue+MAPIStore.m \
\
OpenChange/MAPIStoreContext.m
+41 -2
View File
@@ -46,6 +46,7 @@
#import "MAPIStoreMapping.h"
#import "MAPIStoreTypes.h"
#import "NSArray+MAPIStore.h"
#import "NSObject+MAPIStore.h"
#import "NSString+MAPIStore.h"
#import "MAPIStoreContext.h"
@@ -901,7 +902,13 @@ _prepareContextClass (struct mapistore_context *newMemCtx,
forKey: @"associated"];
[messageProperties setObject: [NSNumber numberWithInt: 1]
forKey: @"mapiRetainCount"];
[messageProperties
setObject: [@"No subject" dataUsingEncoding: NSASCIIStringEncoding]
forKey: MAPIPropertyKey (PR_SEARCH_KEY)];
[messages setObject: messageProperties forKey: midNbr];
[messageProperties release];
}
@@ -1056,8 +1063,10 @@ _prepareContextClass (struct mapistore_context *newMemCtx,
NSArray *children;
NSString *childURL, *folderURL, *childKey;
NSInteger count;
NSDictionary *messageProperties;
void *propValue;
uint64_t fid;
id valueObject;
const char *propName;
enum MAPITAGS tag;
enum MAPISTATUS propRc;
@@ -1124,8 +1133,38 @@ _prepareContextClass (struct mapistore_context *newMemCtx,
}
else
{
[self errorWithFormat: @"No url found for FMID: %lld", fmid];
rc = MAPI_E_INVALID_OBJECT;
messageProperties = [messages objectForKey:
[NSNumber numberWithUnsignedLongLong: fmid]];
if (messageProperties)
{
aRow->lpProps = talloc_array (aRow, struct SPropValue,
sPropTagArray->cValues);
aRow->cValues = sPropTagArray->cValues;
for (count = 0; count < sPropTagArray->cValues; count++)
{
tag = sPropTagArray->aulPropTag[count];
valueObject
= [messageProperties objectForKey: MAPIPropertyKey (tag)];
if (valueObject)
propRc = [valueObject getMAPIValue: &propValue
forTag: tag
inMemCtx: memCtx];
else
{
propValue = MAPILongValue (memCtx, MAPI_E_NOT_FOUND);
tag = (tag & 0xffff0000) | 0x000a;
}
set_SPropValue_proptag (aRow->lpProps + count, tag, propValue);
}
rc = MAPI_E_SUCCESS;
}
else
{
[self errorWithFormat: @"No url found for FMID: %lld", fmid];
rc = MAPI_E_INVALID_OBJECT;
}
}
return rc;
OpenChange/MAPIStoreFSMessageTable.m
+3 -49
View File
@@ -27,14 +27,11 @@
#import "EOQualifier+MAPIFS.h"
#import "MAPIStoreTypes.h"
#import "NSObject+MAPIStore.h"
#import "SOGoMAPIFSFolder.h"
#import "SOGoMAPIFSMessage.h"
#import "MAPIStoreFSMessageTable.h"
#import "NSCalendarDate+MAPIStore.h"
#import "NSData+MAPIStore.h"
#import "NSString+MAPIStore.h"
#import "NSValue+MAPIStore.h"
#undef DEBUG
#include <mapistore/mapistore.h>
@@ -47,57 +44,14 @@
{
NSDictionary *properties;
SOGoMAPIFSMessage *child;
uint16_t valueType;
id value;
int rc;
rc = MAPI_E_SUCCESS;
enum MAPISTATUS rc;
child = [self lookupChild: childKey];
properties = [child properties];
value = [properties objectForKey: MAPIPropertyKey (propTag)];
if (value)
{
// [self logWithFormat: @"property %.8x found", propTag];
valueType = (propTag & 0xffff);
switch (valueType)
{
case PT_NULL:
*data = NULL;
break;
case PT_SHORT:
*data = [value asShortInMemCtx: memCtx];
break;
case PT_LONG:
*data = [value asLongInMemCtx: memCtx];
break;
case PT_BOOLEAN:
*data = [value asBooleanInMemCtx: memCtx];
break;
case PT_DOUBLE:
*data = [value asDoubleInMemCtx: memCtx];
break;
case PT_UNICODE:
case PT_STRING8:
*data = [value asUnicodeInMemCtx: memCtx];
break;
case PT_SYSTIME:
*data = [value asFileTimeInMemCtx: memCtx];
break;
case PT_BINARY:
*data = [value asShortBinaryInMemCtx: memCtx];
break;
case PT_CLSID:
*data = [value asGUIDInMemCtx: memCtx];
break;
default:
[self errorWithFormat: @"object type not handled: %d (0x%.4x)",
valueType, valueType];
*data = NULL;
rc = MAPI_E_NO_SUPPORT;
}
}
rc = [value getMAPIValue: data forTag: propTag inMemCtx: memCtx];
else
rc = [super getChildProperty: data forKey: childKey withTag: propTag];
OpenChange/NSObject+MAPIStore.h
+38
View File
@@ -0,0 +1,38 @@
/* NSObject+MAPIStore.h - this file is part of SOGo
*
* Copyright (C) 2011 Inverse inc
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef NSOBJECT_MAPISTORE_H
#define NSOBJECT_MAPISTORE_H
#import <Foundation/NSObject.h>
#include <talloc.h>
@interface NSObject (MAPIStoreDataTypes)
- (enum MAPISTATUS) getMAPIValue: (void **) data
forTag: (enum MAPITAGS) propTag
inMemCtx: (TALLOC_CTX *) memCtx;
@end
#endif /* NSOBJECT_MAPISTORE_H */
OpenChange/NSObject+MAPIStore.m
+89
View File
@@ -0,0 +1,89 @@
/* NSObject+MAPIStore.m - this file is part of SOGo
*
* Copyright (C) 2011 Inverse inc
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#import <NGExtensions/NSObject+Logs.h>
#import "NSData+MAPIStore.h"
#import "NSCalendarDate+MAPIStore.h"
#import "NSValue+MAPIStore.h"
#import "NSString+MAPIStore.h"
#import "NSObject+MAPIStore.h"
#undef DEBUG
#include <mapistore/mapistore.h>
@implementation NSObject (MAPIStoreDataTypes)
- (enum MAPISTATUS) getMAPIValue: (void **) data
forTag: (enum MAPITAGS) propTag
inMemCtx: (TALLOC_CTX *) memCtx
{
uint16_t valueType;
enum MAPISTATUS rc;
rc = MAPI_E_SUCCESS;
// [self logWithFormat: @"property %.8x found", propTag];
valueType = (propTag & 0xffff);
switch (valueType)
{
case PT_NULL:
*data = NULL;
break;
case PT_SHORT:
*data = [(NSNumber *) self asShortInMemCtx: memCtx];
break;
case PT_LONG:
*data = [(NSNumber *) self asLongInMemCtx: memCtx];
break;
case PT_BOOLEAN:
*data = [(NSNumber *) self asBooleanInMemCtx: memCtx];
break;
case PT_DOUBLE:
*data = [(NSNumber *) self asDoubleInMemCtx: memCtx];
break;
case PT_UNICODE:
case PT_STRING8:
*data = [(NSString *) self asUnicodeInMemCtx: memCtx];
break;
case PT_SYSTIME:
*data = [(NSCalendarDate * ) self asFileTimeInMemCtx: memCtx];
break;
case PT_BINARY:
*data = [(NSData *) self asShortBinaryInMemCtx: memCtx];
break;
case PT_CLSID:
*data = [(NSData *) self asGUIDInMemCtx: memCtx];
break;
default:
[self errorWithFormat: @"object type not handled: %d (0x%.4x)",
valueType, valueType];
*data = NULL;
rc = MAPI_E_NO_SUPPORT;
}
return rc;
}
@end