]> git.deb.at Git - pkg/abook.git/blobdiff - filter.c
some int -> bool changes
[pkg/abook.git] / filter.c
index 4489839470e5b2eb6a9957c3a5d6a06ce083014c..4a537b946de43d08a9a2892f7381f3a150a8b64f 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -2,7 +2,7 @@
 /*
  * $Id$
  *
- * by JH <jheinonen@bigfoot.com>
+ * by JH <jheinonen@users.sourceforge.net>
  *
  * Copyright (C) Jaakko Heinonen
  */
@@ -21,6 +21,7 @@
 #include "list.h"
 #include "misc.h"
 #include "options.h"
+#include <assert.h>
 
 extern int items;
 extern list_item *database;
@@ -30,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);
 
-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);
+/*
+ * export filter prototypes
+ */
+
+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 },
+       { "mutt", "mutt alias", 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 },
@@ -92,11 +106,22 @@ print_filters()
 }
 
 static int
-number_of_filters(struct abook_filter * filters)
+number_of_output_filters()
 {
        int i;
 
-       for(i=0; *filters[i].filtname ; i++)
+       for(i=0; *e_filters[i].filtname ; i++)
+               ;
+
+       return i;
+}
+
+static int
+number_of_input_filters()
+{
+       int i;
+
+       for(i=0; *i_filters[i].filtname ; i++)
                ;
 
        return i;
@@ -112,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);
@@ -160,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;
        }
@@ -205,14 +230,15 @@ i_read_file(char *filename, int (*func) (FILE *in))
 }
 
 int
-import(char filtname[FILTNAME_LEN], char *filename)
+import_file(char filtname[FILTNAME_LEN], char *filename)
 {
        int i;
        int tmp = items;
        int ret = 0;
 
        for(i=0;; i++) {
-               if( ! strncmp(i_filters[i].filtname, filtname, FILTNAME_LEN) )
+               if( ! strncasecmp(i_filters[i].filtname, filtname,
+                                       FILTNAME_LEN) )
                        break;
                if( ! *i_filters[i].filtname ) {
                        i = -1;
@@ -238,7 +264,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()
@@ -266,18 +293,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() || 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 ) {
@@ -285,7 +326,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();
@@ -295,10 +336,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;
@@ -306,7 +349,7 @@ e_write_file(char *filename, int (*func) (FILE *in))
        if( ftell(out) )
                return 1;
 
-       ret = (*func) (out);
+       ret = (*func) (out, enumerator);
        
        fclose(out);
        
@@ -314,12 +357,14 @@ 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) )
+               if( ! strncasecmp(e_filters[i].filtname, filtname,
+                                       FILTNAME_LEN) )
                        break;
                if( ! *e_filters[i].filtname ) {
                        i = -1;
@@ -327,19 +372,22 @@ fexport(char filtname[FILTNAME_LEN], FILE *handle)
                }
        }
 
-       return (e_filters[i].func) (handle);
+       return (e_filters[i].func) (handle, e);
 }
 
        
 
 int
-export(char filtname[FILTNAME_LEN], char *filename)
+export_file(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) )
+               if( ! strncasecmp(e_filters[i].filtname, filtname,
+                                       FILTNAME_LEN) )
                        break;
                if( ! *e_filters[i].filtname ) {
                        i = -1;
@@ -351,9 +399,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;
 }
@@ -370,11 +418,7 @@ export(char filtname[FILTNAME_LEN], char *filename)
 
 static void    ldif_fix_string(char *str);
 
-#ifndef LINESIZE
-#      define LINESIZE 1024
-#endif
-
-#define        LDIF_ITEM_FIELDS        15
+#define        LDIF_ITEM_FIELDS        16
 
 typedef char*  ldif_item[LDIF_ITEM_FIELDS];
 
@@ -382,6 +426,7 @@ static ldif_item ldif_field_names = {
        "cn",   
        "mail",
        "streetaddress",
+       "streetaddress2",
         "locality",
        "st",
        "postalcode",
@@ -400,6 +445,7 @@ static int ldif_conv_table[LDIF_ITEM_FIELDS] = {
        NAME,           /* "cn" */
        EMAIL,          /* "mail" */
        ADDRESS,        /* "streetaddress" */
+       ADDRESS2,       /* "streetaddress2" */     
         CITY,          /* "locality" */
        STATE,          /* "st" */
        ZIP,            /* "postalcode" */
@@ -418,36 +464,39 @@ static int ldif_conv_table[LDIF_ITEM_FIELDS] = {
 static char * 
 ldif_read_line(FILE *in)
 {
-       char line[LINESIZE];
-       char *buf=NULL;
+       char *buf = NULL;
        char *ptr, *tmp;
        long pos;
        int i;
 
-       for(i=1;;i++) {
+       for(i = 1;;i++) {
+               char *line;
+
                pos = ftell(in);
-               fgets(line, LINESIZE, in);
+               line = getaline(in);
                
-               if( feof(in) )
+               if( feof(in) || !line )
                        break;
                
                if(i == 1) {
-                       buf = strdup(line);
+                       buf = line;
                        continue;
                }
                
                if(*line != ' ') {
                        fseek(in, pos, SEEK_SET);
+                       free(line);
                        break;
                }
 
-               ptr = (char *)&line;
+               ptr = line;
                while( *ptr == ' ')
                        ptr++;
 
                tmp = buf;
                buf = strconcat(buf, ptr, NULL);
                free(tmp);
+               free(line);
        }
 
        if( *buf == '#' ) {
@@ -455,12 +504,6 @@ ldif_read_line(FILE *in)
                return NULL;
        }
                
-       if(buf) {
-               int i,j;
-               for(i=0,j=0; j < strlen(buf); i++, j++)
-                       buf[i] = buf[j] == '\n' ? buf[++j] : buf[j];
-       }
-
        return buf;
 }
 
@@ -547,7 +590,7 @@ ldif_fix_string(char *str)
 {
        int i, j;
 
-       for( i = 0, j = 0; j < strlen(str); i++, j++)
+       for( i = 0, j = 0; j < (int)strlen(str); i++, j++)
                str[i] = ( str[j] == (char)0xc3 ?
                                (char) str[++j] + (char) 0x40 :
                                str[j] );
@@ -563,35 +606,21 @@ ldif_fix_string(char *str)
  * mutt alias import filter
  */
 
-enum {
-       MUTT_ALIAS,
-       MUTT_NAME,
-       MUTT_EMAIL
-};
-
-static void
-remove_newlines(char *buf)
-{
-       int i,j;
-       
-       for(i=0,j=0; j < strlen(buf); i++, j++)
-               buf[i] = buf[j] == '\n' ? buf[++j] : buf[j];
-}
+#include "getname.h"
 
 static int
 mutt_read_line(FILE *in, char **alias, char **rest)
 {
-       char line[LINESIZE];
-       char *ptr=(char *)&line;
-       char *tmp;
+       char *line, *ptr, *tmp;
 
-       fgets(line, LINESIZE, in);
-       remove_newlines(line);
+       if( !(line = ptr = getaline(in)) )
+               return 1; /* error / EOF */
 
        while( ISSPACE(*ptr) )
                ptr++;
 
        if( strncmp("alias", ptr, 5) ) {
+               free(line);
                return 1;
        }
                
@@ -605,93 +634,81 @@ 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) {
+               free(line);
                return 1;
+       }
 
        strncpy(*alias, tmp, ptr-tmp);
-       *(*alias+(ptr-tmp)) = 0;
+       *(*alias + (ptr - tmp)) = 0;
 
        while( ISSPACE(*ptr) )
                ptr++;
 
        *rest = strdup(ptr);    
-       
+
+       free(line);
        return 0;
 }
 
 static void
-mutt_parse_email(char *mutt_item[3])
+mutt_parse_email(list_item item)
 {
-       char *tmp;
-       int i;
-
-       if( (tmp = strchr(mutt_item[MUTT_NAME], '<')) )
-               *tmp = 0;
-       else
-               return;
-
-       mutt_item[MUTT_EMAIL] = strdup(tmp+1);
-
-       if( (tmp = strchr(mutt_item[MUTT_EMAIL], '>')) )
-               *tmp = 0;
-
-       tmp = mutt_item[MUTT_NAME];
-
-       for(i=strlen(tmp)-1; i>0; i--)
-               if(ISSPACE(tmp[i]))
-                       tmp[i] = 0;
-               else
-                       break;
-
-       mutt_item[MUTT_NAME] = strdup(tmp);
+       char *line = item[NAME];
+       char *start = line, *tmp;
+       char *name, *email;
+       int i = 0;
 
+       tmp = strconcat("From: ", line, NULL);
+       getname(tmp, &name, &email);
        free(tmp);
-}
 
-static void
-mutt_add_mutt_item(char *mutt_item[3])
-{
-       list_item abook_item;
-
-       memset(abook_item, 0, sizeof(abook_item));
-
-       abook_item[NAME] = safe_strdup(mutt_item[MUTT_NAME]);
-       abook_item[EMAIL] = safe_strdup(mutt_item[MUTT_EMAIL]);
-       abook_item[NICK] = safe_strdup(mutt_item[MUTT_ALIAS]);
-
-       add_item2database(abook_item);
+       if(name)
+               item[NAME] = name;
+       else
+               return;
+       if(email)
+               item[EMAIL] = email;
+       else
+               return;
+       
+       while( (start = strchr(start, ',')) && i++ < MAX_EMAILS - 1) {
+               tmp = strconcat("From: ", ++start, NULL);
+               getname(tmp, &name, &email);
+               free(tmp);
+               free(name);
+               if(email) {
+                       if(*email) {
+                               tmp = strconcat(item[EMAIL], ",", email, NULL);
+                               free(item[EMAIL]);
+                               item[EMAIL] = tmp;
+                       } else {
+                               my_free(email);
+                       }
+               }
+       }
 }
 
 static int
 mutt_parse_file(FILE *in)
 {
-       char *mutt_item[3];
+       list_item item;
 
        for(;;) {
-
-               memset(mutt_item, 0, sizeof(mutt_item) );
+               memset(item, 0, sizeof(item));
                
-               if( mutt_read_line(in, &mutt_item[MUTT_ALIAS],
-                               &mutt_item[MUTT_NAME]) )
-                       continue;
-
-               mutt_parse_email(mutt_item);
+               if( !mutt_read_line(in, &item[NICK],
+                               &item[NAME]) )
+                       mutt_parse_email(item);
 
                if( feof(in) ) {
-                       free(mutt_item[MUTT_ALIAS]);
-                       free(mutt_item[MUTT_NAME]);
-                       free(mutt_item[MUTT_EMAIL]);
+                       free_list_item(item);
                        break;
                }
 
-               mutt_add_mutt_item(mutt_item);
-
-               free(mutt_item[MUTT_ALIAS]);
-               free(mutt_item[MUTT_NAME]);
-               free(mutt_item[MUTT_EMAIL]);
+               add_item2database(item);
        }
 
-
        return 0;
 }
 
@@ -699,6 +716,7 @@ mutt_parse_file(FILE *in)
  * end of mutt alias import filter
  */
 
+
 /*
  * ldif export filter
  */
@@ -716,18 +734,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);
 
@@ -736,10 +754,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]]);
                        }
                }
 
@@ -762,10 +780,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 )
@@ -775,17 +792,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;
@@ -797,13 +820,13 @@ html_export_write_head(FILE *out, int extra_column)
 {
        char *realname = get_real_name();
 
-       fprintf(out, "<html>\n<head>\n  <title>%s's addressbook</title>",
-                       realname );
+       fprintf(out, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n");
+       fprintf(out, "<html>\n<head>\n <title>%s's addressbook</title>", realname );
        fprintf(out, "\n</head>\n<body>\n");
        fprintf(out, "\n<h2>%s's addressbook</h2>\n", realname );
        fprintf(out, "<br><br>\n\n");
 
-       fprintf(out, "<center><table border>\n");
+       fprintf(out, "<table border=\"1\" align=\"center\">\n");
        fprintf(out, "\n<tr><th>Name<th>E-mail address(es)<th>%s</tr>\n\n",
                        abook_fields[extra_column].name);
 
@@ -813,7 +836,7 @@ html_export_write_head(FILE *out, int extra_column)
 static void
 html_export_write_tail(FILE *out)
 {
-       fprintf(out, "\n</table></center>\n");
+       fprintf(out, "\n</table>\n");
        fprintf(out, "\n</body>\n</html>\n");
 }
        
@@ -821,6 +844,7 @@ html_export_write_tail(FILE *out)
  * end of html export filter
  */
 
+
 /*
  * pine addressbook import filter
  */
@@ -830,7 +854,7 @@ pine_fixbuf(char *buf)
 {
        int i,j;
 
-       for(i=0,j=0; j < strlen(buf); i++, j++)
+       for(i=0,j=0; j < (int)strlen(buf); i++, j++)
                buf[i] = buf[j] == '\n' ? buf[++j] : buf[j];
 }
 
@@ -850,7 +874,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;  
                }
@@ -876,7 +900,7 @@ pine_parse_buf(char *buf)
                len = last ? strlen(start) : (int) (end-start);
                len = min(len, 400-1);
        
-               if(i < sizeof(pine_conv_table) / sizeof(*pine_conv_table)
+               if(i < (int)(sizeof(pine_conv_table) / sizeof(*pine_conv_table))
                                && pine_conv_table[i] >= 0) {
                        strncpy(tmp, start, len);
                        tmp[len] = 0;
@@ -896,28 +920,31 @@ static int
 pine_parse_file(FILE *in)
 {
        char line[LINESIZE];
-       char *buf=NULL;
+       char *buf = NULL;
        char *ptr;
        int i;
 
        fgets(line, LINESIZE, in);      
        
        while(!feof(in)) {
-               for(i=2;;i++) {
-                       buf = realloc(buf, i*LINESIZE);
-                       if(i==2)
+               for(i = 2;;i++) {
+                       buf = (char *) realloc(buf, i*LINESIZE);
+                       if(i == 2)
                                strcpy(buf, line);
                        fgets(line, LINESIZE, in);
                        ptr=(char *)&line;
                        if(*ptr != ' ' || feof(in) )
                                break;
                        else
-                               while( *ptr == ' ') ptr++;
+                               while( *ptr == ' ')
+                                       ptr++;
                                
                        strcat(buf, ptr);
                }
-               if( *buf == '#' )
+               if( *buf == '#' ) {
+                       my_free(buf);
                        continue;
+               }
                pine_fixbuf(buf);
 
                pine_parse_buf(buf);
@@ -932,6 +959,7 @@ pine_parse_file(FILE *in)
  * end of pine addressbook import filter
  */
 
+
 /*
  * pine addressbook export filter
  *
@@ -940,17 +968,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])
                                );
        }
 
@@ -962,27 +988,200 @@ 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 < (int)(sizeof(csv_conv_table) / sizeof(*csv_conv_table))
+                       && csv_conv_table[field] >= 0) {
+               item[csv_conv_table[field]] = newstr;
+       } else {
+               my_free(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;
+       bool in_quote = FALSE;
+       list_item item;
+
+       memset(item, 0, sizeof(item));
+
+       for(p = start = line, field = 0; *p; p++) {
+               if(in_quote) {
+                       if(csv_is_valid_quote_end(p))
+                               in_quote = FALSE;
+               } else {
+                       if ( (((p - start) / sizeof (char)) < 2 ) &&
+                               csv_is_valid_quote_start(p) )
+                               in_quote = TRUE;
+               }
+
+               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);
@@ -1005,49 +1204,50 @@ 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] )
-                       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])
+               if ( database[e.item][ADDRESS] )
+                       fprintf(out, "ADR:;;%s;%s;%s;%s;%s;%s\n",
+                               safe_str(database[e.item][ADDRESS]),
+                               safe_str(database[e.item][ADDRESS2]),                           
+                               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",
@@ -1055,10 +1255,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");
                
@@ -1095,19 +1295,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);
        }
@@ -1124,11 +1323,76 @@ 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][ADDRESS2])
+               fprintf(out, "\n%s", database[i][ADDRESS2]);
+
+       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][ADDRESS2])
+               fprintf(out, "\n%s", database[i][ADDRESS2]);
+
+       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");
 
@@ -1138,76 +1402,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");
        }
@@ -1226,18 +1463,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);
        }
@@ -1255,21 +1491,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])
                                        );
                }
        }