X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=filter.c;h=5d20a3743c42471bc455b3bac120edac0e57a162;hb=4f7637954591ecfb575642709bd12a069ee90aab;hp=f760f6bc8275dfbce1736d83a5cdbcf4aa9c0018;hpb=0d3c17d9ab127e5596c8fb97d65122b3b90f6b11;p=pkg%2Fabook.git

diff --git a/filter.c b/filter.c
index f760f6b..5d20a37 100644
--- a/filter.c
+++ b/filter.c
@@ -1,7 +1,8 @@
 
 /*
- * filter.c for abook
- * by JH <jheinonen@bigfoot.com>
+ * $Id$
+ *
+ * by JH <jheinonen@users.sourceforge.net>
  *
  * Copyright (C) Jaakko Heinonen
  */
@@ -20,6 +21,7 @@
 #include "list.h"
 #include "misc.h"
 #include "options.h"
+#include <assert.h>
 
 extern int items;
 extern list_item *database;
@@ -29,30 +31,43 @@ extern struct abook_field abook_fields[];
  * function declarations
  */
 
+/*
+ * import filter prototypes
+ */
+
 static int      ldif_parse_file(FILE *handle);
 static int	mutt_parse_file(FILE *in);
 static int	pine_parse_file(FILE *in);
+static int 	csv_parse_file(FILE *in);
+
+/*
+ * export filter prototypes
+ */
 
-static int      ldif_export_database(FILE *out);
-static int	html_export_database(FILE *out);
-static int	pine_export_database(FILE *out);
-static int	csv_export_database(FILE *out);
-static int	gcrd_export_database(FILE *out);
-static int	mutt_alias_export(FILE *out);
-static int	elm_alias_export(FILE *out);
-static int	text_export_database(FILE *out);
-static int	spruce_export_database(FILE *out);
+static int      ldif_export_database(FILE *out, struct db_enumerator e);
+static int	html_export_database(FILE *out, struct db_enumerator e);
+static int	pine_export_database(FILE *out, struct db_enumerator e);
+static int	csv_export_database(FILE *out, struct db_enumerator e);
+static int	gcrd_export_database(FILE *out, struct db_enumerator e);
+static int	mutt_alias_export(FILE *out, struct db_enumerator e);
+static int	elm_alias_export(FILE *out, struct db_enumerator e);
+static int	text_export_database(FILE *out, struct db_enumerator e);
+static int	spruce_export_database(FILE *out, struct db_enumerator e);
 
+/*
+ * end of function declarations
+ */
 
-struct abook_filter i_filters[] = {
+struct abook_input_filter i_filters[] = {
 	{ "abook", "abook native format", parse_database },
 	{ "ldif", "ldif / Netscape addressbook", ldif_parse_file },
 	{ "mutt", "mutt alias (beta)", mutt_parse_file },
 	{ "pine", "pine addressbook", pine_parse_file },
+	{ "csv", "comma separated values", csv_parse_file },
 	{ "\0", NULL, NULL }
 };
 
-struct abook_filter e_filters[] = {
+struct abook_output_filter e_filters[] = {
 	{ "abook", "abook native format", write_database },
 	{ "ldif", "ldif / Netscape addressbook (.4ld)", ldif_export_database },
 	{ "mutt", "mutt alias", mutt_alias_export },
@@ -91,11 +106,22 @@ print_filters()
 }
 
 static int
-number_of_filters(struct abook_filter * filters)
+number_of_output_filters()
+{
+	int i;
+
+	for(i=0; *e_filters[i].filtname ; i++)
+		;
+
+	return i;
+}
+
+static int
+number_of_input_filters()
 {
 	int i;
 
-	for(i=0; *filters[i].filtname ; i++)
+	for(i=0; *i_filters[i].filtname ; i++)
 		;
 
 	return i;
@@ -111,7 +137,7 @@ get_real_name()
 
 	pwent = getpwnam(username);
 
-	if( (tmp = malloc(strlen(pwent->pw_gecos) +1)) == NULL)
+	if( (tmp = (char *)malloc(strlen(pwent->pw_gecos) +1)) == NULL)
 		return strdup(username);
 
 	rtn = sscanf(pwent->pw_gecos, "%[^,]", tmp);
@@ -159,8 +185,8 @@ import_database()
 	import_screen();
 	
 	filter = getch() - 'a';
-	if(filter == 'x' - 'a' || filter >= number_of_filters(e_filters) ||
-			filter < 0) {
+	if(filter == 'x' - 'a' ||
+		filter >= number_of_input_filters() || filter < 0) {
 		refresh_screen();
 		return 1;
 	}
@@ -237,7 +263,8 @@ import(char filtname[FILTNAME_LEN], char *filename)
  * export
  */
 
-static int		e_write_file(char *filename, int (*func) (FILE *in));
+static int		e_write_file(char *filename,
+		int (*func) (FILE *in, struct db_enumerator e), int mode);
 
 static void
 export_screen()
@@ -265,18 +292,32 @@ int
 export_database()
 {
 	int filter;
+	int enum_mode = ENUM_ALL;
 	char *filename;
 
 	export_screen();
 	
 	filter = getch() - 'a';
-	if(filter == 'x' - 'a' || filter >= number_of_filters(e_filters) ||
-			filter < 0) {
+	if(filter == 'x' - 'a' ||
+		filter >= number_of_output_filters(e_filters) || filter < 0) {
 		refresh_screen();
 		return 1;
 	}
 	
 	mvaddstr(5+filter, 2, "->");
+
+	if( selected_items() ) {
+		statusline_addstr("Export All/Selected/Cancel (A/s/c)");
+		switch( tolower(getch()) ) {
+			case 's':
+				enum_mode = ENUM_SELECTED;
+				break;
+			case 'c':
+				clear_statusline();
+				return 1;
+		}
+		clear_statusline();
+	}
 	
 	filename = ask_filename("Filename: ", 0);
 	if( !filename ) {
@@ -284,7 +325,7 @@ export_database()
 		return 2;
 	}
 	
-	if(  e_write_file(filename, e_filters[filter].func ) )
+	if(  e_write_file(filename, e_filters[filter].func, enum_mode ) )
 		statusline_msg("Error occured while exporting");
 	
 	refresh_screen();
@@ -294,10 +335,12 @@ export_database()
 }
 
 static int
-e_write_file(char *filename, int (*func) (FILE *in))
+e_write_file(char *filename, int (*func) (FILE *in, struct db_enumerator e),
+		int mode)
 {
 	FILE *out;
 	int ret = 0;
+	struct db_enumerator enumerator = init_db_enumerator(mode);
 
 	if( (out = fopen(filename, "a")) == NULL )
 		return 1;
@@ -305,7 +348,7 @@ e_write_file(char *filename, int (*func) (FILE *in))
 	if( ftell(out) )
 		return 1;
 
-	ret = (*func) (out);
+	ret = (*func) (out, enumerator);
 	
 	fclose(out);
 	
@@ -313,9 +356,10 @@ e_write_file(char *filename, int (*func) (FILE *in))
 }
 
 int
-fexport(char filtname[FILTNAME_LEN], FILE *handle)
+fexport(char filtname[FILTNAME_LEN], FILE *handle, int enum_mode)
 {
 	int i;
+	struct db_enumerator e = init_db_enumerator(enum_mode);
 
 	for(i=0;; i++) {
 		if( ! strncmp(e_filters[i].filtname, filtname, FILTNAME_LEN) )
@@ -326,7 +370,7 @@ fexport(char filtname[FILTNAME_LEN], FILE *handle)
 		}
 	}
 
-	return (e_filters[i].func) (handle);
+	return (e_filters[i].func) (handle, e);
 }
 
 	
@@ -334,8 +378,10 @@ fexport(char filtname[FILTNAME_LEN], FILE *handle)
 int
 export(char filtname[FILTNAME_LEN], char *filename)
 {
+	const int mode = ENUM_ALL;
 	int i;
 	int ret = 0;
+	struct db_enumerator e = init_db_enumerator(mode);
 	
 	for(i=0;; i++) {
 		if( ! strncmp(e_filters[i].filtname, filtname, FILTNAME_LEN) )
@@ -350,9 +396,9 @@ export(char filtname[FILTNAME_LEN], char *filename)
 		return -1;
 
 	if( !strcmp(filename, "-") )
-		ret = (e_filters[i].func) (stdout);
+		ret = (e_filters[i].func) (stdout, e);
 	else
-		ret =  e_write_file(filename, e_filters[i].func);
+		ret =  e_write_file(filename, e_filters[i].func, mode);
 
 	return ret;
 }
@@ -604,7 +650,7 @@ mutt_read_line(FILE *in, char **alias, char **rest)
 	while( ! ISSPACE(*ptr) )
 		ptr++;
 
-	if( (*alias = malloc(ptr-tmp+1)) == NULL)
+	if( (*alias = (char *)malloc(ptr-tmp+1)) == NULL)
 		return 1;
 
 	strncpy(*alias, tmp, ptr-tmp);
@@ -698,6 +744,7 @@ mutt_parse_file(FILE *in)
  * end of mutt alias import filter
  */
 
+
 /*
  * ldif export filter
  */
@@ -715,18 +762,18 @@ ldif_fput_type_and_value(FILE *out,char *type, char *value )
 }
 
 static int
-ldif_export_database(FILE *out)
+ldif_export_database(FILE *out, struct db_enumerator e)
 {
-	int i;
 	char email[MAX_EMAILSTR_LEN];
 
 	fprintf(out, "version: 1\n");
-	for(i=0; i<items; i++) {
+
+	db_enumerate_items(e) {
 		char *tmp;
 		int j;
-		get_first_email(email, i);
+		get_first_email(email, e.item);
 
-		tmp = mkstr("cn=%s,mail=%s", database[i][NAME], email);
+		tmp = mkstr("cn=%s,mail=%s", database[e.item][NAME], email);
 		ldif_fput_type_and_value(out, "dn", tmp);
 		free(tmp);
 
@@ -735,10 +782,10 @@ ldif_export_database(FILE *out)
 				if(ldif_conv_table[j] == EMAIL)
 					ldif_fput_type_and_value(out,
 						ldif_field_names[j], email);
-				else if(database[i][ldif_conv_table[j]])
+				else if(database[e.item][ldif_conv_table[j]])
 					ldif_fput_type_and_value(out,
 						ldif_field_names[j],
-						database[i][ldif_conv_table[j]]);
+						database[e.item][ldif_conv_table[j]]);
 			}
 		}
 
@@ -761,10 +808,9 @@ static void            html_export_write_head(FILE *out, int extra_column);
 static void            html_export_write_tail(FILE *out);
 
 static int
-html_export_database(FILE *out)
+html_export_database(FILE *out, struct db_enumerator e)
 {
 	char tmp[MAX_EMAILSTR_LEN];
-	int i;
 	int extra_column = options_get_int("extra_column");
 
 	if( items < 1 )
@@ -774,17 +820,23 @@ html_export_database(FILE *out)
 		extra_column : PHONE;
 
 	html_export_write_head(out, extra_column);
-	for( i = 0; i < items; i++ ) {
-		get_first_email(tmp, i);
-		fprintf(out, "<tr>\n<td><a href=\"mailto:%s\">%s</a>\n",
-				tmp,
-				database[i][NAME] );
-				
+
+	db_enumerate_items(e) {
+		get_first_email(tmp, e.item);
+		if (*tmp)
+		    fprintf(out, "<tr>\n<td><a href=\"mailto:%s\">%s</a>\n",
+			    tmp,
+			    database[e.item][NAME] );
+		else
+		    fprintf(out, "<tr>\n<td>%s>\n",
+			    database[e.item][NAME] );
+
 		fprintf(out, "<td>%s\n<td>%s\n",
-				database[i][EMAIL],
-				safe_str(database[i][extra_column]) );
+				database[e.item][EMAIL],
+				safe_str(database[e.item][extra_column]) );
 		fprintf(out, "</tr>\n\n");
 	}
+
 	html_export_write_tail(out);
 
 	return 0;
@@ -796,6 +848,7 @@ html_export_write_head(FILE *out, int extra_column)
 {
 	char *realname = get_real_name();
 
+	fprintf(out, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n");
 	fprintf(out, "<html>\n<head>\n	<title>%s's addressbook</title>",
 			realname );
 	fprintf(out, "\n</head>\n<body>\n");
@@ -820,6 +873,7 @@ html_export_write_tail(FILE *out)
  * end of html export filter
  */
 
+
 /*
  * pine addressbook import filter
  */
@@ -849,7 +903,7 @@ pine_convert_emails(char *s)
 		*tmp=0;
 	
 	for(i=1; ( tmp = strchr(s, ',') ) != NULL ; i++, s=tmp+1 )
-		if( i > 3 ) {
+		if( i > MAX_EMAILS - 1 ) {
 			*tmp = 0;
 			break;	
 		}
@@ -903,7 +957,7 @@ pine_parse_file(FILE *in)
 	
 	while(!feof(in)) {
 		for(i=2;;i++) {
-			buf = realloc(buf, i*LINESIZE);
+			buf = (char *) realloc(buf, i*LINESIZE);
 			if(i==2)
 				strcpy(buf, line);
 			fgets(line, LINESIZE, in);
@@ -915,8 +969,10 @@ pine_parse_file(FILE *in)
 				
 			strcat(buf, ptr);
 		}
-		if( *buf == '#' )
+		if( *buf == '#' ) {
+			my_free(buf);
 			continue;
+		}
 		pine_fixbuf(buf);
 
 		pine_parse_buf(buf);
@@ -931,6 +987,7 @@ pine_parse_file(FILE *in)
  * end of pine addressbook import filter
  */
 
+
 /*
  * pine addressbook export filter
  *
@@ -939,17 +996,15 @@ pine_parse_file(FILE *in)
  */
 
 static int
-pine_export_database(FILE *out)
+pine_export_database(FILE *out, struct db_enumerator e)
 {
-	int i;
-
-	for(i=0; i < items; i++ ) {
-		fprintf(out, have_multiple_emails(i) ?
+	db_enumerate_items(e) {
+		fprintf(out, have_multiple_emails(e.item) ?
 				"%s\t%s\t(%s)\t\t%s\n" : "%s\t%s\t%s\t\t%s\n",
-				safe_str(database[i][NICK]),
-				safe_str(database[i][NAME]),
-				safe_str(database[i][EMAIL]),
-				safe_str(database[i][NOTES])
+				safe_str(database[e.item][NICK]),
+				safe_str(database[e.item][NAME]),
+				safe_str(database[e.item][EMAIL]),
+				safe_str(database[e.item][NOTES])
 				);
 	}
 
@@ -961,27 +1016,198 @@ pine_export_database(FILE *out)
  */
 
 
+/*
+ * csv import filter
+ */
+
+/* FIXME
+ * these files should be parsed according to a certain
+ * lay out, or the default if layout is not given, at 
+ * the moment only default is done...
+ */ 
+
+#define CSV_COMMENT_CHAR	'#'
+
+static int csv_conv_table[] = {
+	NAME,
+	EMAIL,
+	PHONE,
+	NOTES,
+	NICK
+};
+
+static void
+csv_convert_emails(char *s)
+{
+	int i;
+	char *tmp;
+
+	if( s == NULL )
+		return;
+
+	for(i=1; ( tmp = strchr(s, ',') ) != NULL ; i++, s = tmp + 1 )
+		if( i > MAX_EMAILS - 1 ) {
+			*tmp = 0;
+			break;	
+		}
+
+}
+
+static char *
+csv_remove_quotes(char *s)
+{
+	char *copy, *trimmed;
+	int len;
+	
+	copy = trimmed = strdup(s);
+	strtrim(trimmed);
+	
+	len = strlen(trimmed);
+	if(trimmed[len - 1] == '\"' && *trimmed == '\"') {
+		if(len < 3) {
+			my_free(copy);
+			return NULL;
+		}
+		trimmed[len - 1] = 0;
+		trimmed++;
+		trimmed = strdup(trimmed);
+		free(copy);
+		return trimmed;
+	}
+
+	my_free(copy);
+	return strdup(s);
+}
+
+static void
+csv_store_field(list_item item, char *s, int field)
+{
+	char *newstr = NULL;
+
+	if(!s || !*s)
+		return;
+
+	if( !(newstr = csv_remove_quotes(s)) )
+		return;
+
+	if(field < (sizeof(csv_conv_table) / sizeof(*csv_conv_table))
+			&& csv_conv_table[field] >= 0) {
+		item[csv_conv_table[field]] = newstr;
+	}
+}
+
+static int
+csv_is_valid_quote_end(char *p)
+{
+	if(*p != '\"')
+		return FALSE;
+
+	for(p++; *p; p++) {
+		if(*p == ',')
+			return TRUE;
+		else if(!ISSPACE(*p))
+			return FALSE;
+	}
+
+	return TRUE;
+}
+
+static int
+csv_is_valid_quote_start(char *p)
+{
+	for(; *p; p++) {
+		if(*p == '\"')
+			return TRUE;
+		else if(!ISSPACE(*p))
+			return FALSE;
+	}
+
+	return FALSE;
+}
+
+static void
+csv_parse_line(char *line)
+{
+	char *p, *start;
+	int field;
+	int in_quote = FALSE;
+	list_item item;
+
+	memset(item, 0, sizeof(item));
+
+	for(p = start = line, field = 0; *p; p++) {
+		if(!in_quote) {
+			if ( (((p - start) / sizeof (char)) < 2 ) &&
+				csv_is_valid_quote_start(p) )
+				in_quote = TRUE;
+		} else {
+			if(csv_is_valid_quote_end(p))
+				in_quote = FALSE;
+		}
+
+		if( *p == ',' && !in_quote) {
+			*p = 0;
+			csv_store_field(item, start, field);
+			field++;
+			start = p + 1;
+		}
+	}
+	/*
+	 * store last field
+	 */
+	csv_store_field(item, start, field);
+
+	csv_convert_emails(item[EMAIL]);
+	add_item2database(item);
+}
+
+
+static int
+csv_parse_file(FILE *in)
+{
+	char *line = NULL;
+
+	while(!feof(in)) {
+		line = getaline(in);
+
+		if(line && *line && *line != CSV_COMMENT_CHAR)
+			csv_parse_line(line);
+
+		my_free(line);
+	}
+
+	return 0;
+}
+
+/*
+ * end of csv import filter
+ */
+
 /*
  * csv addressbook export filter
  */
 
 static int
-csv_export_database(FILE *out)
+csv_export_database(FILE *out, struct db_enumerator e)
 {
-	int i, j;
+	int j;
 	int csv_export_fields[] = {
 		NAME,
 		EMAIL,
 		PHONE,
 		NOTES,
+		NICK,
 		-1
 	};
 
-	for(i=0; i < items; i++ ) {
+	db_enumerate_items(e) {
 		for(j = 0; csv_export_fields[j] >= 0; j++) {
-			fprintf(out, strchr(safe_str(database[i][csv_export_fields[j]]), ',') ?
+			fprintf(out,(
+		strchr(safe_str(database[e.item][csv_export_fields[j]]), ',') ||
+		strchr(safe_str(database[e.item][csv_export_fields[j]]), '\"')
+			) ?
 				"\"%s\"" : "%s",
-				safe_str(database[i][csv_export_fields[j]])
+				safe_str(database[e.item][csv_export_fields[j]])
 				);
 			if(csv_export_fields[j+1] >= 0)
 				fputc(',', out);
@@ -1004,49 +1230,49 @@ csv_export_database(FILE *out)
  */
 
 static int
-gcrd_export_database(FILE *out)
+gcrd_export_database(FILE *out, struct db_enumerator e)
 {
 	char emails[MAX_EMAILS][MAX_EMAIL_LEN];
-	int i, j;
+	int j;
 	char *name;
 
-	for(i=0; i < items; i++ ) {
+	db_enumerate_items(e) {
 		fprintf(out, "BEGIN:VCARD\nFN:%s\n",
-				safe_str(database[i][NAME]));
+				safe_str(database[e.item][NAME]));
 
-		name = get_surname(database[i][NAME]);
-	        for( j = strlen(database[i][NAME]) - 1; j >= 0; j-- ) {
-	                if(database[i][NAME][j] == ' ')
+		name = get_surname(database[e.item][NAME]);
+	        for( j = strlen(database[e.item][NAME]) - 1; j >= 0; j-- ) {
+	                if(database[e.item][NAME][j] == ' ')
 	                        break;
 	        } 
 		fprintf(out, "N:%s;%.*s\n",
 			safe_str(name),
 			j,
-			safe_str(database[i][NAME])
+			safe_str(database[e.item][NAME])
 			); 
 
 		free(name);
 
-		if ( database[i][ADDRESS] )
+		if ( database[e.item][ADDRESS] )
 			fprintf(out, "ADR:;;%s;%s;%s;%s;%s\n",
-				safe_str(database[i][ADDRESS]),
-				safe_str(database[i][CITY]),
-				safe_str(database[i][STATE]),
-				safe_str(database[i][ZIP]),
-				safe_str(database[i][COUNTRY])
+				safe_str(database[e.item][ADDRESS]),
+				safe_str(database[e.item][CITY]),
+				safe_str(database[e.item][STATE]),
+				safe_str(database[e.item][ZIP]),
+				safe_str(database[e.item][COUNTRY])
 				);
 		
-		if (database[i][PHONE])
-			fprintf(out, "TEL;HOME:%s\n", database[i][PHONE]);
-		if (database[i][WORKPHONE])
-			fprintf(out, "TEL;WORK:%s\n", database[i][WORKPHONE]);
-		if (database[i][FAX])
-			fprintf(out, "TEL;FAX:%s\n", database[i][FAX]);
-		if (database[i][MOBILEPHONE])
-			fprintf(out, "TEL;CELL:%s\n", database[i][MOBILEPHONE]);
-
-		if ( database[i][EMAIL] ) {
-			split_emailstr(i, emails);
+		if (database[e.item][PHONE])
+			fprintf(out, "TEL;HOME:%s\n", database[e.item][PHONE]);
+		if (database[e.item][WORKPHONE])
+			fprintf(out, "TEL;WORK:%s\n", database[e.item][WORKPHONE]);
+		if (database[e.item][FAX])
+			fprintf(out, "TEL;FAX:%s\n", database[e.item][FAX]);
+		if (database[e.item][MOBILEPHONE])
+			fprintf(out, "TEL;CELL:%s\n", database[e.item][MOBILEPHONE]);
+
+		if ( database[e.item][EMAIL] ) {
+			split_emailstr(e.item, emails);
 			for(j=0; j < MAX_EMAILS ; j++) {
 				if ( *emails[j] ) 
 					fprintf(out, "EMAIL;INTERNET:%s\n",
@@ -1054,10 +1280,10 @@ gcrd_export_database(FILE *out)
 			}
 		}
 		
-		if ( database[i][NOTES] ) 
-			fprintf(out, "NOTE:%s\n", database[i][NOTES]);
-		if (database[i][URL])
-			fprintf(out, "URL:%s\n",  database[i][URL]);
+		if ( database[e.item][NOTES] ) 
+			fprintf(out, "NOTE:%s\n", database[e.item][NOTES]);
+		if (database[e.item][URL])
+			fprintf(out, "URL:%s\n",  database[e.item][URL]);
 
 		fprintf(out, "END:VCARD\n\n");
 		
@@ -1094,19 +1320,18 @@ mutt_alias_genalias(int i)
 }
 
 static int
-mutt_alias_export(FILE *out)
+mutt_alias_export(FILE *out, struct db_enumerator e)
 {
-	int i;
 	char email[MAX_EMAIL_LEN];
 	char *alias = NULL;
 
-	for(i=0; i<items; i++) {
-		alias = mutt_alias_genalias(i);
+	db_enumerate_items(e) {
+		alias = mutt_alias_genalias(e.item);
 
-		get_first_email(email, i);
+		get_first_email(email, e.item);
 		fprintf(out, *email ? "alias %s %s <%s>\n": "alias %s %s%s\n",
 				alias,
-				database[i][NAME],
+				database[e.item][NAME],
 				email);
 		my_free(alias);
 	}
@@ -1123,11 +1348,70 @@ mutt_alias_export(FILE *out)
  * printable export filter
  */
 
+
+static void
+text_write_address_us(FILE *out, int i) {
+	fprintf(out, "\n%s", database[i][ADDRESS]);
+	
+	if (database[i][CITY])
+		fprintf(out, "\n%s", database[i][CITY]);
+		
+	if (database[i][STATE] || database[i][ZIP]) {
+		fputc('\n', out);
+		
+		if(database[i][STATE]) {
+			fprintf(out, "%s", database[i][STATE]);
+			if(database[i][ZIP])
+				fputc(' ', out);
+		}
+
+		if(database[i][ZIP])
+			fprintf(out, "%s", database[i][ZIP]);
+	}
+
+	if (database[i][COUNTRY])
+		fprintf(out, "\n%s", database[i][COUNTRY]);
+}
+
+
+static void
+text_write_address_uk(FILE *out, int i) {
+	int j;
+
+	for (j = ADDRESS; j <= COUNTRY; j++)
+		if (database[i][j])
+			fprintf(out, "\n%s", database[i][j]);
+}
+
+static void
+text_write_address_eu(FILE *out, int i) {
+	fprintf(out, "\n%s", database[i][ADDRESS]);
+	
+	if (database[i][ZIP] || database[i][CITY]) {
+		fputc('\n', out);
+
+		if(database[i][ZIP]) {
+			fprintf(out, "%s", database[i][ZIP]);
+			if(database[i][CITY])
+				fputc(' ', out);
+		}
+
+		if(database[i][CITY])
+			fprintf(out, "%s", database[i][CITY]);
+	}
+	
+	if (database[i][STATE])
+		fprintf(out, "\n%s", database[i][STATE]);
+
+	if (database[i][COUNTRY])
+		fprintf(out, "\n%s", database[i][COUNTRY]);
+}
+
 static int
-text_export_database(FILE * out)
+text_export_database(FILE * out, struct db_enumerator e)
 {
 	char emails[MAX_EMAILS][MAX_EMAIL_LEN];
-	int i, j;
+	int j;
 	char *realname = get_real_name();
 	char *style = options_get_str("address_style");
 
@@ -1137,76 +1421,49 @@ text_export_database(FILE * out)
 		realname);
 	free(realname);
 
-	for (i = 0; i < items; i++) {
+	db_enumerate_items(e) {
 		fprintf(out,
 			"-----------------------------------------\n\n");
-		fprintf(out, "%s", database[i][NAME]);
-		if (database[i][NICK])
-			fprintf(out, "\n(%s)", database[i][NICK]);
+		fprintf(out, "%s", database[e.item][NAME]);
+		if (database[e.item][NICK])
+			fprintf(out, "\n(%s)", database[e.item][NICK]);
 		fprintf(out, "\n");
 
-		if (*database[i][EMAIL]) {
+		if (*database[e.item][EMAIL]) {
 			fprintf(out, "\n");
-			split_emailstr(i, emails);
+			split_emailstr(e.item, emails);
 			for (j = 0; j < MAX_EMAILS; j++)
 				if (*emails[j])
 					fprintf(out, "%s\n", emails[j]);
 		}
 		/* Print address */
-		if (database[i][ADDRESS]) {
-			if (!safe_strcmp(style, "us")) {	/* US like */
-				fprintf(out, "\n%s", database[i][ADDRESS]);
-				if (database[i][CITY])
-					fprintf(out, "\n%s",
-						database[i][CITY]);
-				if (database[i][STATE] || database[i][ZIP])
-					fprintf(out, "\n%s %s",
-						safe_str(database[i]
-							 [STATE]),
-						safe_str(database[i]
-							 [ZIP]));
-				if (database[i][COUNTRY])
-					fprintf(out, "\n%s",
-						database[i][COUNTRY]);
-			}
-
-			else if (!safe_strcmp(style, "uk")) {	/* UK like */
-				for (j = ADDRESS; j <= COUNTRY; j++)
-					if (database[i][j])
-						fprintf(out, "\n%s",
-							database[i][j]);
-			} else {	/* EU like */
-				fprintf(out, "\n%s", database[i][ADDRESS]);
-				if (database[i][ZIP] || database[i][CITY])
-					fprintf(out, "\n%s %s",
-						safe_str(database[i][ZIP]),
-						safe_str(database[i]
-							 [CITY]));
-				if (database[i][STATE])
-					fprintf(out, "\n%s",
-						database[i][STATE]);
-				if (database[i][COUNTRY])
-					fprintf(out, "\n%s",
-						database[i][COUNTRY]);
-			}
+		if (database[e.item][ADDRESS]) {
+			if (!safe_strcmp(style, "us"))	/* US like */
+				text_write_address_us(out, e.item);
+			else if (!safe_strcmp(style, "uk"))	/* UK like */
+				text_write_address_uk(out, e.item);
+			else	/* EU like */
+				text_write_address_eu(out, e.item);
 
 			fprintf(out, "\n");
 		}
 
-		if ((database[i][PHONE]) || (database[i][WORKPHONE]) ||
-		    (database[i][FAX]) || (database[i][MOBILEPHONE])) {
+		if ((database[e.item][PHONE]) ||
+			(database[e.item][WORKPHONE]) ||
+			(database[e.item][FAX]) ||
+			(database[e.item][MOBILEPHONE])) {
 			fprintf(out, "\n");
 			for (j = PHONE; j <= MOBILEPHONE; j++)
-				if (database[i][j])
+				if (database[e.item][j])
 					fprintf(out, "%s: %s\n",
 						abook_fields[j].name,
-						database[i][j]);
+						database[e.item][j]);
 		}
 
-		if (database[i][URL])
-			fprintf(out, "\n%s\n", database[i][URL]);
-		if (database[i][NOTES])
-			fprintf(out, "\n%s\n", database[i][NOTES]);
+		if (database[e.item][URL])
+			fprintf(out, "\n%s\n", database[e.item][URL]);
+		if (database[e.item][NOTES])
+			fprintf(out, "\n%s\n", database[e.item][NOTES]);
 
 		fprintf(out, "\n");
 	}
@@ -1225,18 +1482,17 @@ text_export_database(FILE * out)
  */
 
 static int
-elm_alias_export(FILE *out)
+elm_alias_export(FILE *out, struct db_enumerator e)
 {
-	int i;
 	char email[MAX_EMAIL_LEN];
 	char *alias = NULL;
 
-	for(i=0; i<items; i++) {
-		alias = mutt_alias_genalias(i);
-		get_first_email(email, i);
+	db_enumerate_items(e) {
+		alias = mutt_alias_genalias(e.item);
+		get_first_email(email, e.item);
 		fprintf(out, "%s = %s = %s\n",
 				alias,
-				database[i][NAME],
+				database[e.item][NAME],
 				email);
 		my_free(alias);
 	}
@@ -1254,21 +1510,20 @@ elm_alias_export(FILE *out)
  */
 
 static int
-spruce_export_database (FILE *out)
+spruce_export_database (FILE *out, struct db_enumerator e)
 {
-	int i;
 	char email[MAX_EMAIL_LEN];
 
 	fprintf (out, "# This is a generated file made by abook for the Spruce e-mail client.\n\n");
 
-	for (i= 0; i< items; i++) {
-		if(strcmp (safe_str(database[i][EMAIL]), "")) {
-			get_first_email(email, i);
+	db_enumerate_items(e) {
+		if(strcmp (safe_str(database[e.item][EMAIL]), "")) {
+			get_first_email(email, e.item);
 			fprintf(out, "# Address %d\nName: %s\nEmail: %s\nMemo: %s\n\n",
-					i,
-					database[i][NAME],
+					e.item,
+					database[e.item][NAME],
 					email,
-					safe_str(database[i][NOTES])
+					safe_str(database[e.item][NOTES])
 					);
 		}
 	}