Monotone-Parent: a02bbe9f2e1f3a2c472f0499b21e163f8b6170ec

Monotone-Revision: fc67c49fbd49fb6ce4ebc0af25642bc75b7652ad

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-10-26T20:15:01
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,5 +1,9 @@
 2010-10-26  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OGoContentStore/OCSContactFieldExtractor.m
+	(-extractQuickFieldsFromVCard:): we now extract the list of
+	categories from the vcard.
+
 	* UI/WebServerResources/UIxPreferences.js: added code to handle
 	the new "Contacts Options" tab, in particular the contacts
 	categories.

OGoContentStore/GNUmakefile.preamble

@@ -6,11 +6,12 @@ libOGoContentStore_LIBRARIES_DEPEND_UPON += \
 	-lNGCards	\
 	-lNGExtensions	\
 	-lEOControl	\
-	-lSaxObjC
+	-lSaxObjC \
+        -lSOGo
 
 ADDITIONAL_INCLUDE_DIRS += -I. -I.. -I../SOPE
 
-ADDITIONAL_LIB_DIRS += -L./$(GNUSTEP_OBJ_DIR) -L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/
+ADDITIONAL_LIB_DIRS += -L./$(GNUSTEP_OBJ_DIR) -L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ -L../SoObjects/SOGo/SOGo.framework/
 
 SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 

OGoContentStore/OCSContactFieldExtractor.m

@@ -28,6 +28,8 @@
 #import <NGCards/NGVCard.h>
 #import <NGCards/NGVList.h>
 
+#import <SOGo/NSArray+Utilities.h>
+
 @interface OCSContactFieldExtractor : GCSFieldExtractor
 @end
 
@@ -78,6 +80,10 @@
     [fields setObject: [adr value: 3] forKey: @"c_l"];
   value = [[vCard uniqueChildWithTag: @"X-AIM"] value: 0];
   [fields setObject: value forKey: @"c_screenname"];
+  values = [[vCard categories] trimmedComponents];
+  if ([values count] > 0)
+    [fields setObject: [values componentsJoinedByString: @","]
+               forKey: @"c_categories"];
   [fields setObject: @"vcard" forKey: @"c_component"];
 
   return fields;

OGoContentStore/contact-oracle.ocs

@@ -55,6 +55,11 @@
       sqlType    = "VARCHAR2(255)";
       allowsNull = YES;
     },
+    {
+      columnName = c_categories;
+      sqlType    = "VARCHAR2(255)";
+      allowsNull = YES;
+    },
     {
       columnName = c_component;
       sqlType    = "VARCHAR2(10)";

OGoContentStore/contact.ocs

@@ -55,6 +55,11 @@
       sqlType    = "VARCHAR(255)";
       allowsNull = YES;
     },
+    {
+      columnName = c_categories;
+      sqlType    = "VARCHAR(255)";
+      allowsNull = YES;
+    },
     {
       columnName = c_component;
       sqlType    = "VARCHAR(10)";

Scripts/sql-update-1.3.3_to_1.3.4-mysql.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# this script only works with MySQL
+
+defaultusername=$USER
+defaulthostname=localhost
+defaultdatabase=$USER
+indextable=sogo_folder_info
+
+read -p "Username ($defaultusername): " username
+read -p "Hostname ($defaulthostname): " hostname
+read -p "Database ($defaultdatabase): " database
+
+if [ -z "$username" ]
+then
+  username=$defaultusername
+fi
+
+if [ -z "$hostname" ]
+then
+  hostname=$defaulthostname
+fi
+
+if [ -z "$database" ]
+then
+  database=$defaultdatabase
+ fi
+
+ sqlscript=""
+
+function addField() {
+  oldIFS="$IFS"
+  IFS=" "
+  part="`echo -e \"ALTER TABLE $table ADD COLUMN c_categories VARCHAR(255);\\n\"`";
+  sqlscript="$sqlscript$part"
+  IFS="$oldIFS"
+}
+
+tables=`mysql -p -N -B -u $username -h $hostname $database -e "select SUBSTRING_INDEX(c_quick_location, '/', -1) from $indextable where c_folder_type = 'Contact';"`
+
+for table in $tables;
+do
+  addField
+done
+echo "$sqlscript" | mysql -p -s -u $username -h $hostname $database > /dev/null

Scripts/sql-update-1.3.3_to_1.3.4.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# this script only works with PostgreSQL
+
+defaultusername=$USER
+defaulthostname=localhost
+defaultdatabase=$USER
+indextable=sogo_folder_info
+
+read -p "Username ($defaultusername): " username
+read -p "Hostname ($defaulthostname): " hostname
+read -p "Database ($defaultdatabase): " database
+
+if [ -z "$username" ]
+then
+  username=$defaultusername
+fi
+if [ -z "$hostname" ]
+then
+  hostname=$defaulthostname
+fi
+if [ -z "$database" ]
+then
+  database=$defaultdatabase
+fi
+
+sqlscript=""
+
+function addField() {
+    oldIFS="$IFS"
+    IFS=" "
+    part="`echo -e \"ALTER TABLE $table ADD COLUMN c_categories VARCHAR(255);\\n\"`";
+    sqlscript="$sqlscript$part"
+    IFS="$oldIFS"
+}
+
+tables=`psql -t -U $username -h $hostname $database -c "select split_part(c_quick_location, '/', 5) from $indextable where c_folder_type = 'Contact';"`
+
+for table in $tables;
+do
+  addField
+done
+
+echo "$sqlscript" | psql -q -e -U $username -h $hostname $database > /dev/null