evolution-data-server r9279 - trunk/camel

[sragavan svn gnome org]

Author: sragavan
Date: Wed Aug  6 11:33:56 2008
New Revision: 9279
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9279&view=rev

Log:
2008-08-06  Srinivasa Ragavan  <sragavan novell com>

	* camel/camel-db.c: Add apis to delete vuids in transaction and clean
	up add vuid api.
	* camel/camel-db.h:


Modified:
   trunk/camel/ChangeLog
   trunk/camel/camel-db.c
   trunk/camel/camel-db.h

Modified: trunk/camel/camel-db.c
==============================================================================
--- trunk/camel/camel-db.c	(original)
+++ trunk/camel/camel-db.c	Wed Aug  6 11:33:56 2008
@@ -501,6 +501,21 @@
 	 return ret;
 }
 
+int
+camel_db_delete_uid_from_vfolder_transaction (CamelDB *db, char *folder_name, char *vuid, CamelException *ex)
+{
+	char *del_query;
+	int ret;
+	 
+	del_query = sqlite3_mprintf ("DELETE FROM %Q WHERE vuid = %Q", folder_name, vuid);
+
+	ret = camel_db_add_to_transaction (db, del_query, ex);
+	 
+	sqlite3_free (del_query);
+
+	return ret;
+}
+
 static int
 read_uids_callback (void *ref, int ncol, char ** cols, char ** name)
 {
@@ -624,17 +639,14 @@
 int
 camel_db_add_to_vfolder (CamelDB *db, char *folder_name, char *vuid, CamelException *ex)
 {
-	 char *del_query, *ins_query;
+	 char *ins_query;
 	 int ret;
 	 
 	 ins_query = sqlite3_mprintf ("INSERT INTO %Q VALUES (%Q)", folder_name, vuid);
-	 del_query = sqlite3_mprintf ("DELETE FROM %Q WHERE vuid = %Q", folder_name, vuid);
 
-	 ret = camel_db_command (db, del_query, ex);
 	 ret = camel_db_command (db, ins_query, ex);
 	 
 	 sqlite3_free (ins_query);
-	 sqlite3_free (del_query);
 	 CAMEL_DB_RELEASE_SQLITE_MEMORY;
 	 return ret;
 }
@@ -642,17 +654,14 @@
 int
 camel_db_add_to_vfolder_transaction (CamelDB *db, char *folder_name, char *vuid, CamelException *ex)
 {
-	 char *del_query, *ins_query;
+	 char *ins_query;
 	 int ret;
 	 
 	 ins_query = sqlite3_mprintf ("INSERT INTO %Q VALUES (%Q)", folder_name, vuid);
-	 del_query = sqlite3_mprintf ("DELETE FROM %Q WHERE vuid = %Q", folder_name, vuid);
 
-	 ret = camel_db_add_to_transaction (db, del_query, ex);
 	 ret = camel_db_add_to_transaction (db, ins_query, ex);
 	 
 	 sqlite3_free (ins_query);
-	 sqlite3_free (del_query);
 
 	 return ret;
 }

Modified: trunk/camel/camel-db.h
==============================================================================
--- trunk/camel/camel-db.h	(original)
+++ trunk/camel/camel-db.h	Wed Aug  6 11:33:56 2008
@@ -143,6 +143,7 @@
 int camel_db_create_vfolder (CamelDB *db, const char *folder_name, CamelException *ex);
 int camel_db_recreate_vfolder (CamelDB *db, const char *folder_name, CamelException *ex);
 int camel_db_delete_uid_from_vfolder (CamelDB *db, char *folder_name, char *vuid, CamelException *ex);
+int camel_db_delete_uid_from_vfolder_transaction (CamelDB *db, char *folder_name, char *vuid, CamelException *ex);
 GPtrArray * camel_db_get_vuids_from_vfolder (CamelDB *db, char *folder_name, char *filter, CamelException *ex);
 int camel_db_add_to_vfolder (CamelDB *db, char *folder_name, char *vuid, CamelException *ex);
 int camel_db_add_to_vfolder_transaction (CamelDB *db, char *folder_name, char *vuid, CamelException *ex);