From: helge Date: Tue, 29 Jun 2004 22:56:04 +0000 (+0000) Subject: git-svn-id: http://svn.opengroupware.org/SOGo/trunk@85 d1b88da0-ebda-0310-925b-ed51d8... X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6ac926b528a04a6db443c30cd3183d53b388dcf;p=scalable-opengroupware.org git-svn-id: http://svn.opengroupware.org/SOGo/trunk@85 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/OGoContentStore/GNUmakefile b/OGoContentStore/GNUmakefile index 90983adb..4f71ff72 100644 --- a/OGoContentStore/GNUmakefile +++ b/OGoContentStore/GNUmakefile @@ -16,6 +16,8 @@ libOGoContentStore_HEADER_FILES += \ OCSFolderManager.h \ OCSFolderType.h \ OCSChannelManager.h \ + OCSFieldExtractor.h \ + OCSiCalFieldExtractor.h \ libOGoContentStore_OBJC_FILES += \ NSURL+OCS.m \ @@ -27,6 +29,8 @@ libOGoContentStore_OBJC_FILES += \ OCSFolderManager.m \ OCSFolderType.m \ OCSChannelManager.m \ + OCSFieldExtractor.m \ + OCSiCalFieldExtractor.m \ ocs_ls_OBJC_FILES += ocs_ls.m ocs_mkdir_OBJC_FILES += ocs_mkdir.m diff --git a/OGoContentStore/OCSFieldExtractor.h b/OGoContentStore/OCSFieldExtractor.h new file mode 100644 index 00000000..b32a9d31 --- /dev/null +++ b/OGoContentStore/OCSFieldExtractor.h @@ -0,0 +1,34 @@ +/* + Copyright (C) 2004 SKYRIX Software AG + + This file is part of OpenGroupware.org. + + OGo is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + OGo 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 Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with OGo; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. +*/ +// $Id$ + +#ifndef __OGoContentStore_OCSFieldExtractor_H__ +#define __OGoContentStore_OCSFieldExtractor_H__ + +#import + +@interface OCSFieldExtractor : NSObject +{ +} + +@end + +#endif /* __OGoContentStore_OCSFieldExtractor_H__ */ diff --git a/OGoContentStore/OCSFieldExtractor.m b/OGoContentStore/OCSFieldExtractor.m new file mode 100644 index 00000000..1b8ed2dd --- /dev/null +++ b/OGoContentStore/OCSFieldExtractor.m @@ -0,0 +1,32 @@ +/* + Copyright (C) 2004 SKYRIX Software AG + + This file is part of OpenGroupware.org. + + OGo is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + OGo 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 Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with OGo; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. +*/ +// $Id$ + +#include "OCSFieldExtractor.h" +#include "common.h" + +@implementation OCSFieldExtractor + +- (void)dealloc { + [super dealloc]; +} + +@end /* OCSFieldExtractor */ diff --git a/OGoContentStore/OCSiCalFieldExtractor.h b/OGoContentStore/OCSiCalFieldExtractor.h new file mode 100644 index 00000000..eaea5cac --- /dev/null +++ b/OGoContentStore/OCSiCalFieldExtractor.h @@ -0,0 +1,36 @@ +/* + Copyright (C) 2004 SKYRIX Software AG + + This file is part of OpenGroupware.org. + + OGo is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + OGo 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 Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with OGo; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. +*/ +// $Id$ + +#ifndef __OGoContentStore_OCSiCalFieldExtractor_H__ +#define __OGoContentStore_OCSiCalFieldExtractor_H__ + +#include + +@interface OCSiCalFieldExtractor : OCSFieldExtractor +{ +} + ++ (id)sharedICalFieldExtractor; + +@end + +#endif /* __OGoContentStore_OCSiCalFieldExtractor_H__ */ diff --git a/OGoContentStore/OCSiCalFieldExtractor.m b/OGoContentStore/OCSiCalFieldExtractor.m new file mode 100644 index 00000000..629da25a --- /dev/null +++ b/OGoContentStore/OCSiCalFieldExtractor.m @@ -0,0 +1,39 @@ +/* + Copyright (C) 2004 SKYRIX Software AG + + This file is part of OpenGroupware.org. + + OGo is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + OGo 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 Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with OGo; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. +*/ +// $Id$ + +#include "OCSiCalFieldExtractor.h" +#include "common.h" + +@implementation OCSiCalFieldExtractor + +static OCSiCalFieldExtractor *extractor = nil; + ++ (id)sharedICalFieldExtractor { + if (extractor == nil) extractor = [[self alloc] init]; + return extractor; +} + +- (void)dealloc { + [super dealloc]; +} + +@end /* OCSiCalFieldExtractor */ diff --git a/OGoContentStore/appointment.ocs b/OGoContentStore/appointment.ocs index 081a4cb2..66af164e 100644 --- a/OGoContentStore/appointment.ocs +++ b/OGoContentStore/appointment.ocs @@ -4,10 +4,9 @@ fields = ( { - columnName = pkey; - sqlType = "INTEGER"; - allowsNull = NO; - isPrimaryKey = YES; + columnName = uid; + sqlType = "VARCHAR(256)"; + allowsNull = NO; }, { columnName = startdate; diff --git a/OGoContentStore/sql/appointment-hh-create.psql b/OGoContentStore/sql/appointment-hh-create.psql index 747b7910..c0b0fc02 100644 --- a/OGoContentStore/sql/appointment-hh-create.psql +++ b/OGoContentStore/sql/appointment-hh-create.psql @@ -9,8 +9,8 @@ DROP TABLE SOGo_helge_privcal; CREATE TABLE SOGo_helge_privcal_quick ( c_name VARCHAR(256) NOT NULL PRIMARY KEY, -- the filename uid VARCHAR(256) NOT NULL, - startdate INT NOT NULL, - enddate INT NOT NULL, + startdate INT NOT NULL, + enddate INT NOT NULL, title VARCHAR(1000) NOT NULL, participants VARCHAR(100000) NOT NULL ); diff --git a/OGoContentStore/sql/testapt-hh.psql b/OGoContentStore/sql/testapt-hh.psql index 1ced1136..678cfdc5 100644 --- a/OGoContentStore/sql/testapt-hh.psql +++ b/OGoContentStore/sql/testapt-hh.psql @@ -18,7 +18,7 @@ VALUES ( 928383, 1, - 'BEGIN:VEVENT + 'BEGIN:VEVENT 2 DURATION:PT1H ATTENDEE;CN="Elke Bethke";DIR="addressbook://B156F3F0-9CFD-11D8-8561-000 D93C1A604:ABPerson":mailto:E.Bethke@Sachsen-Anhalt-Lotto.de