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

diff --git a/OGoContentStore/ChangeLog b/OGoContentStore/ChangeLog
index bbc10df0209a08be7138851903c55677511dfde4..40fb349586025e505baf9d7b2ae5b6e431919d7a 100644 (file)
--- a/OGoContentStore/ChangeLog
+++ b/OGoContentStore/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-26  Helge Hess  <helge.hess@opengroupware.org>
+
+       * sql: added missing priority quickfield to SQLite tables (v0.9.31)
+
 2005-07-13  Helge Hess  <helge.hess@opengroupware.org>
 
        * OCSContactFieldExtractor.m: do not crash if the content is not a

diff --git a/OGoContentStore/Version b/OGoContentStore/Version
index ae2cbb060abe8de8bfa52dbf2199636f6bf20e01..b33046f8b82102aad534372363fa24d671d00416 100644 (file)
--- a/OGoContentStore/Version
+++ b/OGoContentStore/Version
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION=0
 MINOR_VERSION=9
-SUBMINOR_VERSION:=30
+SUBMINOR_VERSION:=31
 
 # v0.9.30 requires libNGiCal          v4.5.48
 # v0.9.26 requires libGDLContentStore v4.5.26

diff --git a/OGoContentStore/sql/folderinfo-create.sqlite b/OGoContentStore/sql/folderinfo-create.sqlite
index c96e09ae06eaf7f6694b54b6a397f3ef665674c8..cb5e58548c934b0fc1f70c96475e2e9b8fc965f1 100644 (file)
--- a/OGoContentStore/sql/folderinfo-create.sqlite
+++ b/OGoContentStore/sql/folderinfo-create.sqlite
@@ -4,7 +4,7 @@
 -- TODO:
 --   add a unique constraints on path
 
-DROP TABLE SOGo_folder_info;
+-- DROP TABLE SOGo_folder_info;
 
 CREATE TABLE SOGo_folder_info (
   c_folder_id      INTEGER PRIMARY KEY,

diff --git a/OGoContentStore/sql/foldertablecreate-helge-privcal.sqlite b/OGoContentStore/sql/foldertablecreate-helge-privcal.sqlite
index ed20827489cd5921e571f73e7c4b5b9f533d8560..4b324bbe6c5303938c547d92cabd745bc6d3e2ac 100644 (file)
--- a/OGoContentStore/sql/foldertablecreate-helge-privcal.sqlite
+++ b/OGoContentStore/sql/foldertablecreate-helge-privcal.sqlite
@@ -19,6 +19,7 @@ CREATE TABLE SOGo_helge_privcal_quick (
   ispublic     INT             NOT NULL,
   status       INT             NOT NULL,
   isopaque     INT             NULL,
+  priority     INT             NOT NULL, -- for marking high prio apts
   location     VARCHAR(256)    NULL,
   orgmail      VARCHAR(256)    NULL,
   partmails    VARCHAR(100000) NOT NULL, /* the emails of the participants */

diff --git a/OGoContentStore/sql/generate-folderinfo-sql-for-users-sqlite.sh b/OGoContentStore/sql/generate-folderinfo-sql-for-users-sqlite.sh
index 00b49f5aba74a3580ee115cf590bf69a8b9c7c40..19b702c38247103b31f1e71fba061b7404f368aa 100755 (executable)
--- a/OGoContentStore/sql/generate-folderinfo-sql-for-users-sqlite.sh
+++ b/OGoContentStore/sql/generate-folderinfo-sql-for-users-sqlite.sh
@@ -70,6 +70,7 @@ CREATE TABLE SOGo_${USER_TABLE}_privcal_quick (
   ispublic     INT             NOT NULL,
   status       INT             NOT NULL,
   isopaque     INT             NULL,
+  priority     INT             NOT NULL, -- for marking high prio apts
   location     VARCHAR(256)    NULL,
   orgmail      VARCHAR(256)    NULL,
   partmails    VARCHAR(100000) NOT NULL, /* the emails of the participants */

diff --git a/OGoContentStore/sql/generate-folderinfo-sql-for-users-sqlite1table.sh b/OGoContentStore/sql/generate-folderinfo-sql-for-users-sqlite1table.sh
index e56568b1313a32f3af7b9c76551d90f12bc24132..3b1a7a96ab6ebc947cb0d3ad510a0f143c1b6ac5 100755 (executable)
--- a/OGoContentStore/sql/generate-folderinfo-sql-for-users-sqlite1table.sh
+++ b/OGoContentStore/sql/generate-folderinfo-sql-for-users-sqlite1table.sh
@@ -75,6 +75,7 @@ CREATE TABLE SOGo_${USER_TABLE}_privcal (
   iscycle      INT             NULL,     /* client needs to fetch to resolve */
   ispublic     INT             NOT NULL,
   status       INT             NOT NULL,
+  priority     INT             NOT NULL, -- for marking high prio apts
   isopaque     INT             NULL,
   location     VARCHAR(256)    NULL,
   orgmail      VARCHAR(256)    NULL,

diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m
index 429554a836b3bf2b9284a15180f8d9a356275815..4222e95110e13a401667510773124dedc7684bec 100644 (file)
--- a/SoObjects/Mailer/SOGoMailFolder.m
+++ b/SoObjects/Mailer/SOGoMailFolder.m
@@ -285,13 +285,14 @@ static BOOL useAltNamespace = NO;
 - (id)lookupName:(NSString *)_key inContext:(id)_ctx acquire:(BOOL)_acquire {
   id obj;
   
-  if ([self isMessageKey:_key inContext:_ctx])
+  if ([self isMessageKey:_key inContext:_ctx]) {
     /* 
        We assume here that _key is a number and methods are not and this is
        moved above the super lookup since the super checks the
        -toOneRelationshipKeys which in turn loads the message ids.
     */
     return [self lookupImap4Message:_key inContext:_ctx];
+  }
   
   /* check attributes directly bound to the app */
   if ((obj = [super lookupName:_key inContext:_ctx acquire:NO]))