evolution-data-server r8830 - branches/camel-db-summary/camel

[sragavan svn gnome org]

Author: sragavan
Date: Fri May 23 03:56:50 2008
New Revision: 8830
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8830&view=rev

Log:
Completed summary_header_load/save to db.


Modified:
   branches/camel-db-summary/camel/camel-folder-summary.c
   branches/camel-db-summary/camel/camel-folder-summary.h

Modified: branches/camel-db-summary/camel/camel-folder-summary.c
==============================================================================
--- branches/camel-db-summary/camel/camel-folder-summary.c	(original)
+++ branches/camel-db-summary/camel/camel-folder-summary.c	Fri May 23 03:56:50 2008
@@ -54,6 +54,7 @@
 #include "camel-stream-mem.h"
 #include "camel-stream-null.h"
 #include "camel-string-utils.h"
+#include "camel-store.h"
 
 static pthread_mutex_t info_lock = PTHREAD_MUTEX_INITIALIZER;
 
@@ -1576,16 +1577,15 @@
 	return 0;
 }
 
-#define DB_COUNT(lhs,var,cond) str =  g_strdup_printf ("select counts(%s) from %s%s", var, table_name, cond); \
-	ldh = camel_db_count (s->folder->parent_store->cdb, str); \
+#define DB_COUNT(lhs,var,cond) str =  g_strdup_printf ("select count(%s) from %s%s", var, table_name, cond); \
+	lhs = camel_db_count (s->folder->parent_store->cdb, str); \
 	g_free (str);
 
 
 static	CamelFIRecord *
 summary_header_to_db (CamelFolderSummary *s)
 {
-	int unread = 0, deleted = 0, junk = 0, count, i;
-	struct _CamelFIRecord * record = g_new0 (struct _CamelFIRecord, 1);
+	CamelFIRecord * record = g_new0 (struct _CamelFIRecord, 1);
 	char *table_name = safe_table (camel_file_util_safe_filename (s->folder->full_name));
 	char *str;
 	

Modified: branches/camel-db-summary/camel/camel-folder-summary.h
==============================================================================
--- branches/camel-db-summary/camel/camel-folder-summary.h	(original)
+++ branches/camel-db-summary/camel/camel-folder-summary.h	Fri May 23 03:56:50 2008
@@ -311,7 +311,11 @@
 	/* Load/Save folder summary from DB*/
 	int (*summary_header_from_db)(CamelFolderSummary *, CamelFIRecord *);
 	CamelFIRecord * (*summary_header_to_db)(CamelFolderSummary *);
-				      
+	CamelMessageInfo * (*message_info_from_db) (CamelFolderSummary *, struct _CamelMIRecord*);
+	CamelMIRecord * (*message_info_to_db) (CamelFolderSummary *, CamelMessageInfo *);
+	CamelMessageContentInfo * (*content_info_from_db) (CamelFolderSummary *, CamelMIRecord *);
+	int (*content_info_to_db) (CamelFolderSummary *, CamelMessageContentInfo *, CamelMIRecord *);
+	
 	/* create/save/load an individual message info */
 	CamelMessageInfo * (*message_info_new_from_header)(CamelFolderSummary *, struct _camel_header_raw *);
 	CamelMessageInfo * (*message_info_new_from_parser)(CamelFolderSummary *, CamelMimeParser *);