git-svn-id: http://svn.opengroupware.org/SOGo/trunk@85 d1b88da0-ebda-0310-925b-ed51d8...

diff --git a/OGoContentStore/GNUmakefile b/OGoContentStore/GNUmakefile
index 90983adba12bdc5695e070bb312998a1da17b697..4f71ff72067e2d6fb0c15fd42f1233d223b8fe41 100644 (file)
--- 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 (file)
index 0000000..b32a9d3
--- /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 <Foundation/NSObject.h>
+
+@interface OCSFieldExtractor : NSObject
+{
+}
+
+@end
+
+#endif /* __OGoContentStore_OCSFieldExtractor_H__ */

diff --git a/OGoContentStore/OCSFieldExtractor.m b/OGoContentStore/OCSFieldExtractor.m
new file mode 100644 (file)
index 0000000..1b8ed2d
--- /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 (file)
index 0000000..eaea5ca
--- /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 <OGoContentStore/OCSFieldExtractor.h>
+
+@interface OCSiCalFieldExtractor : OCSFieldExtractor
+{
+}
+
++ (id)sharedICalFieldExtractor;
+
+@end
+
+#endif /* __OGoContentStore_OCSiCalFieldExtractor_H__ */

diff --git a/OGoContentStore/OCSiCalFieldExtractor.m b/OGoContentStore/OCSiCalFieldExtractor.m
new file mode 100644 (file)
index 0000000..629da25
--- /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 081a4cb22d0dac468cefb62838c89b086367f881..66af164e8a08202decc49bf89744e2f72d9b949c 100644 (file)
--- 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 747b791018797b91c7a779414c713be9d608fb3e..c0b0fc02241fb65cb0be2dfcac78d50016d9ae58 100644 (file)
--- 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 1ced113690d4fd84145725a409b0f6a80dc873b1..678cfdc5f6c6742c3374be707c5ef216dc74afb1 100644 (file)
--- a/OGoContentStore/sql/testapt-hh.psql
+++ b/OGoContentStore/sql/testapt-hh.psql
@@ -18,7 +18,7 @@ VALUES (
   928383,
   1,
 
-  'BEGIN:VEVENT\r
+  'BEGIN:VEVENT\r2
 DURATION:PT1H\r
 ATTENDEE;CN="Elke Bethke";DIR="addressbook://B156F3F0-9CFD-11D8-8561-000\r
  D93C1A604:ABPerson":mailto:E.Bethke@Sachsen-Anhalt-Lotto.de\r