]> git.deb.at Git - pkg/abook.git/blobdiff - filter.c
mutt-query (1/3): moved muttq_print_item() from abook.c to filter.c
[pkg/abook.git] / filter.c
index 1f171722673733c6d5f17a7fcd3cab494d113c44..ff4d116b1ac652afd816e41efe8ee6c93f9bb95d 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -7,6 +7,8 @@
  * Copyright (C) Jaakko Heinonen
  */
 
+#define _GNU_SOURCE
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -44,6 +46,7 @@ static int    pine_parse_file(FILE *in);
 static int     csv_parse_file(FILE *in);
 static int     allcsv_parse_file(FILE *in);
 static int     palmcsv_parse_file(FILE *in);
+static int     vcard_parse_file(FILE *in);
 
 /*
  * export filter prototypes
@@ -55,12 +58,13 @@ static int  pine_export_database(FILE *out, struct db_enumerator e);
 static int     csv_export_database(FILE *out, struct db_enumerator e);
 static int     allcsv_export_database(FILE *out, struct db_enumerator e);
 static int     palm_export_database(FILE *out, struct db_enumerator e);
-static int     gcrd_export_database(FILE *out, struct db_enumerator e);
+static int     vcard_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);
 static int     wl_export_database(FILE *out, struct db_enumerator e);
+static int     bsdcal_export_database(FILE *out, struct db_enumerator e);
 
 /*
  * end of function declarations
@@ -74,16 +78,17 @@ struct abook_input_filter i_filters[] = {
        { "csv", N_("comma separated values"), csv_parse_file },
        { "allcsv", N_("comma separated values (all fields)"), allcsv_parse_file },
        { "palmcsv", N_("Palm comma separated values"), palmcsv_parse_file },
+       { "vcard", N_("vCard file"), vcard_parse_file },
        { "\0", NULL, NULL }
 };
 
 struct abook_output_filter e_filters[] = {
        { "abook", N_("abook native format"), write_database },
        { "ldif", N_("ldif / Netscape addressbook (.4ld)"), ldif_export_database },
+       { "vcard", N_("vCard 2 file"), vcard_export_database },
        { "mutt", N_("mutt alias"), mutt_alias_export },
        { "html", N_("html document"), html_export_database },
        { "pine", N_("pine addressbook"), pine_export_database },
-       { "gcrd", N_("GnomeCard (VCard) addressbook"), gcrd_export_database },
        { "csv", N_("comma separated values"), csv_export_database },
        { "allcsv", N_("comma separated values (all fields)"), allcsv_export_database },
        { "palmcsv", N_("Palm comma separated values"), palm_export_database},
@@ -91,9 +96,14 @@ struct abook_output_filter e_filters[] = {
        { "text", N_("plain text"), text_export_database },
        { "wl", N_("Wanderlust address book"), wl_export_database },
        { "spruce", N_("Spruce address book"), spruce_export_database },
+       { "bsdcal", N_("BSD calendar"), bsdcal_export_database },
        { "\0", NULL, NULL }
 };
 
+struct abook_output_item_filter u_filters[] = {
+       { "\0", NULL }
+};
+
 /*
  * common functions
  */
@@ -116,6 +126,13 @@ print_filters()
                        gettext(e_filters[i].desc));
 
        putchar('\n');
+
+       puts(_("output (with query):"));
+       for(i=0; *u_filters[i].filtname ; i++)
+               printf("\t%s\t%s\n", u_filters[i].filtname,
+                       gettext(u_filters[i].desc));
+
+       putchar('\n');
 }
 
 static int
@@ -355,6 +372,25 @@ export_database()
        return 0;
 }
 
+struct abook_output_item_filter select_output_item_filter(char filtname[FILTNAME_LEN]) {
+       int i;
+       for(i=0;; i++) {
+               if(!strncasecmp(u_filters[i].filtname, filtname, FILTNAME_LEN))
+                 break;
+               if(!*u_filters[i].filtname) {
+                 i = -1;
+                 break;
+               }
+       }
+       return u_filters[i];
+}
+
+void
+e_write_item(FILE *out, int item, void (*func) (FILE *in, int item))
+{
+  (*func) (out, item);
+}
+
 static int
 e_write_file(char *filename, int (*func) (FILE *in, struct db_enumerator e),
                int mode)
@@ -632,10 +668,11 @@ ldif_fix_string(char *str)
 #include "getname.h"
 
 static int
-mutt_read_line(FILE *in, char **alias, char **rest)
+mutt_read_line(FILE *in, char **groups, char **alias, char **rest)
 {
-       char *line, *ptr, *tmp;
-       size_t alias_len;
+       char *line, *ptr;
+       char *start, *end;
+       abook_list *glist = NULL;
 
        if( !(line = ptr = getaline(in)) )
                return 1; /* error / EOF */
@@ -648,27 +685,39 @@ mutt_read_line(FILE *in, char **alias, char **rest)
        }
 
        ptr += 5;
-
        SKIPWS(ptr);
 
-       tmp = ptr;
-
-       while( ! ISSPACE(*ptr) )
-               ptr++;
+       /* If the group option is used, save the groups */
+       *groups = NULL;
+       start = ptr;
+       int n_groups;
+       for(n_groups = 0; 0 == strncmp("-group", ptr, 6); n_groups++) {
+               ptr += 6;
+               SKIPWS(ptr);
+               start = ptr;
+               SKIPNONWS(ptr);
+               end = ptr;
+               abook_list_append(&glist,xstrndup(start, end - start));
+               SKIPWS(ptr);
+       }
 
-       alias_len = (size_t)(ptr - tmp);
+       if(n_groups && groups)
+               *groups = abook_list_to_csv(glist);
 
-       if(alias)
-               *alias = xmalloc_inc(alias_len, 1);
-
-       strncpy(*alias, tmp, alias_len);
-       *(*alias + alias_len) = 0;
+       abook_list_free(&glist);        
 
+       /* alias */
+       start = ptr;
+       SKIPNONWS(ptr);
+       end = ptr;
        SKIPWS(ptr);
+       if(alias)
+               *alias = xstrndup(start, end - start);
 
+       /* rest (email) */
        *rest = xstrdup(ptr);
 
-       free(line);
+       xfree(line);
        return 0;
 }
 
@@ -749,9 +798,9 @@ mutt_parse_file(FILE *in)
                memset(item, 0, fields_count * sizeof(char *));
 
                if(!mutt_read_line(in,
-                                       (field_id(NICK) != -1) ?
-                                       &item[field_id(NICK)] : NULL,
-                                       &item[field_id(NAME)]))
+                       (field_id(GROUPS) != -1) ? &item[field_id(GROUPS)] : NULL,
+                       (field_id(NICK) != -1) ? &item[field_id(NICK)] : NULL,
+                       &item[field_id(NAME)]) )
                        mutt_parse_email(item);
 
                if(feof(in)) {
@@ -832,37 +881,56 @@ ldif_export_database(FILE *out, struct db_enumerator e)
  * html export filter
  */
 
-static void            html_export_write_head(FILE *out, int extra_column);
+static void            html_export_write_head(FILE *out);
 static void            html_export_write_tail(FILE *out);
 
+extern struct index_elem *index_elements;
+
+static void
+html_print_emails(FILE *out, struct list_field *f)
+{
+       abook_list *l = csv_to_abook_list(f->data);
+
+       for(; l; l = l->next) {
+               fprintf(out, "<a href=\"mailto:%s\">%s</a>", l->data, l->data);
+               if(l->next)
+                       fprintf(out, ", ");
+       }
+
+       abook_list_free(&l);
+}
+
 static int
 html_export_database(FILE *out, struct db_enumerator e)
 {
-       char tmp[MAX_EMAILSTR_LEN];
-       int extra_column;
+       struct list_field f;
+       struct index_elem *cur;
 
        if(list_is_empty())
                return 2;
 
-       extra_column = init_extra_field(STR_EXTRA_COLUMN);
-       html_export_write_head(out, extra_column);
+       init_index();
 
-       db_enumerate_items(e) {
-               get_first_email(tmp, e.item);
-               if (*tmp)
-                   fprintf(out, "<tr>\n<td>"
-                                   "<a href=\"mailto:%s\">%s</a>"
-                                   "</td>\n",
-                           tmp,
-                           db_name_get(e.item));
-               else
-                   fprintf(out, "<tr>\n<td>%s</td>\n", db_name_get(e.item));
+       html_export_write_head(out);
 
-               fprintf(out, "<td>%s</td>\n", db_email_get(e.item));
-               if(extra_column >= 0)
-                       fprintf(out, "<td>%s</td>\n",
-                               safe_str(db_fget_byid(e.item, extra_column)));
-               fprintf(out, "</tr>\n\n");
+       db_enumerate_items(e) {
+               fprintf(out, "<tr>");
+               for(cur = index_elements; cur; cur = cur->next) {
+                       if(cur->type != INDEX_FIELD)
+                               continue;
+
+                       get_list_field(e.item, cur, &f);
+
+                       if(f.type == FIELD_EMAILS) {
+                               fprintf(out, "<td>");
+                               html_print_emails(out, &f);
+                               fprintf(out, "</td>");
+                               continue;
+                       } else {
+                               fprintf(out, "<td>%s</td>", safe_str(f.data));
+                       }
+               }
+               fprintf(out, "</tr>\n");
        }
 
        html_export_write_tail(out);
@@ -871,9 +939,10 @@ html_export_database(FILE *out, struct db_enumerator e)
 }
 
 static void
-html_export_write_head(FILE *out, int extra_column)
+html_export_write_head(FILE *out)
 {
-       char *realname = get_real_name(), *extra_column_name = NULL;
+       char *realname = get_real_name(), *str;
+       struct index_elem *cur;
 
        fprintf(out, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n");
        fprintf(out, "<html>\n<head>\n <title>%s's addressbook</title>",
@@ -882,11 +951,13 @@ html_export_write_head(FILE *out, int extra_column)
        fprintf(out, "\n<h2>%s's addressbook</h2>\n", realname );
        fprintf(out, "<br><br>\n\n");
 
-       fprintf(out, "<table border=\"1\" align=\"center\">\n");
-       fprintf(out, "\n<tr><th>Name</th><th>E-mail address(es)</th>");
-       if(extra_column >= 0) {
-               get_field_keyname(extra_column, NULL, &extra_column_name);
-               fprintf(out, "<th>%s</th>", safe_str(extra_column_name));
+       fprintf(out, "<table border=\"1\" align=\"center\">\n<tr>");
+       for(cur = index_elements; cur; cur = cur->next) {
+               if(cur->type != INDEX_FIELD)
+                       continue;
+
+               get_field_info(cur->d.field.id, NULL, &str, NULL);
+               fprintf(out, "<th>%s</th>", str);
        }
        fprintf(out, "</tr>\n\n");
 
@@ -916,7 +987,7 @@ pine_fixbuf(char *buf)
 {
        int i,j;
 
-       for(i=0,j=0; j < (int)strlen(buf); i++, j++)
+       for(i = 0,j = 0; j < (int)strlen(buf); i++, j++)
                buf[i] = buf[j] == '\n' ? buf[++j] : buf[j];
 }
 
@@ -929,15 +1000,15 @@ pine_convert_emails(char *s)
        if(s == NULL || *s != '(')
                return;
 
-       for(i=0; s[i]; i++ )
-               s[i] = s[i+1];
+       for(i = 0; s[i]; i++)
+               s[i] = s[i + 1];
 
        if( ( tmp = strchr(s,')')) )
-               *tmp=0;
+               *tmp = '\0';
 
        for(i = 1; ( tmp = strchr(s, ',') ) != NULL ; i++, s = tmp + 1)
                if(i > MAX_LIST_ITEMS - 1) {
-                       *tmp = 0;
+                       *tmp = '\0';
                        break;
                }
 
@@ -1035,14 +1106,18 @@ pine_parse_file(FILE *in)
 static int
 pine_export_database(FILE *out, struct db_enumerator e)
 {
+       char *emails;
+
        db_enumerate_items(e) {
-               fprintf(out, have_multiple_emails(e.item) ?
+               emails = db_email_get(e.item);
+               fprintf(out, strchr(emails, ',') /* multiple addresses? */ ?
                                "%s\t%s\t(%s)\t\t%s\n" : "%s\t%s\t%s\t\t%s\n",
                                safe_str(db_fget(e.item, NICK)),
                                safe_str(db_name_get(e.item)),
-                               safe_str(db_email_get(e.item)),
+                               emails,
                                safe_str(db_fget(e.item, NOTES))
                                );
+               free(emails);
        }
 
        return 0;
@@ -1302,6 +1377,278 @@ palmcsv_parse_file(FILE *in)
  * end of csv import filter
  */
 
+/*
+ * vCard import filter
+ */
+
+static char *vcard_fields[] = {
+       "FN",                   /* FORMATTED NAME */
+       "EMAIL",                /* EMAIL */
+       "ADR",                  /* ADDRESS */
+       "ADR",                  /* ADDRESS2 - not used */
+       "ADR",                  /* CITY */
+       "ADR",                  /* STATE */
+       "ADR",                  /* ZIP */
+       "ADR",                  /* COUNTRY */
+       "TEL",                  /* PHONE */
+       "TEL",                  /* WORKPHONE */
+       "TEL",                  /* FAX */
+       "TEL",                  /* MOBILEPHONE */
+       "NICKNAME",             /* NICK */
+       "URL",                  /* URL */
+       "NOTE",                 /* NOTES */
+       "N",                    /* NAME: special case/mapping in vcard_parse_line() */
+       NULL                    /* not implemented: ANNIVERSARY, ITEM_FIELDS */
+};
+
+/*
+ * mappings between vCard ADR field and abook's ADDRESS
+ * see rfc2426 section 3.2.1
+ */
+static int vcard_address_fields[] = {
+       -1,                     /* vCard(post office box) - not used */
+       -1,                     /* vCard(the extended address) - not used */
+       2,                      /* vCard(the street address) - ADDRESS */
+       4,                      /* vCard(the locality) - CITY */
+       5,                      /* vCard(the region) - STATE */
+       6,                      /* vCard(the postal code) - ZIP */
+       7                       /* vCard(the country name) - COUNTRY */
+};
+
+enum {
+       VCARD_KEY = 0,
+       VCARD_KEY_ATTRIBUTE,
+       VCARD_VALUE,
+};
+
+static char *
+vcard_get_line_element(char *line, int element)
+{
+       int i;
+       char *line_copy = 0;
+       char *result = 0;
+       char *key = 0;
+       char *key_attr = 0;
+       char *value = 0;
+
+       line_copy = xstrdup(line);
+
+       /* change newline characters, if present, to end of string */
+       for(i=0; line_copy[i]; i++) {
+               if(line_copy[i] == '\r' || line_copy[i] == '\n') {
+                       line_copy[i] = '\0';
+                       break;
+               }
+       }
+
+       /* separate key from value */
+       for(i=0; line_copy[i]; i++) {
+               if(line_copy[i] == ':') {
+                       line_copy[i] = '\0';
+                       key = line_copy;
+                       value = &line_copy[i+1];
+                       break;
+               }
+       }
+
+       /* separate key from key attributes */
+       /* works for vCard 2 as well (automagically) */
+       if (key) {
+               for(i=0; key[i]; i++) {
+                       if(key[i] == ';') {
+                               key[i] = '\0';
+                               key_attr = &key[i+1];
+                               break;
+                       }
+               }
+       }
+
+       switch(element) {
+       case VCARD_KEY:
+               if(key)
+                       result = xstrdup(key);
+               break;
+       case VCARD_KEY_ATTRIBUTE:
+               if(key_attr)
+                       result = xstrdup(key_attr);
+               break;
+       case VCARD_VALUE:
+               if(value)
+                       result = xstrdup(value);
+               break;
+       }
+
+       xfree(line_copy);
+       return result;
+}
+
+static void
+vcard_parse_email(list_item item, char *line)
+{
+       char *email;
+
+       email = vcard_get_line_element(line, VCARD_VALUE);
+
+       if(item[1]) {
+               item[1] = strconcat(item[1], ",", email, 0);
+               xfree(email);
+       }
+       else {
+               item[1] = email;
+       }
+}
+
+static void
+vcard_parse_address(list_item item, char *line)
+{
+       int i;
+       int k;
+       char *value;
+       char *address_field;
+
+       value = vcard_get_line_element(line, VCARD_VALUE);
+       if(!value)
+               return;
+
+       address_field = value;
+       for(i=k=0; value[i]; i++) {
+               if(value[i] == ';') {
+                       value[i] = '\0';
+                       if(vcard_address_fields[k] >= 0) {
+                               item[vcard_address_fields[k]] = xstrdup(address_field);
+                       }
+                       address_field = &value[i+1];
+                       k++;
+                       if((k+1)==(sizeof(vcard_address_fields)/sizeof(*vcard_address_fields)))
+                               break;
+               }
+       }
+       item[vcard_address_fields[k]] = xstrdup(address_field);
+       xfree(value);
+}
+
+static void
+vcard_parse_name(list_item item, char *line)
+{
+       // store the "N" field into "NAME" *if* no "FN:"
+       // value has already been stored here
+       if(item[0]) return;
+
+       int i = -1;
+       item[0] = vcard_get_line_element(line, VCARD_VALUE);
+       // "N:" can be multivalued => replace ';' separators by ' '
+       while(item[0][++i]) if(item[0][i] == ';') item[0][i] = ' ';
+
+       // http://www.daniweb.com/software-development/c/code/216919
+       char *original = item[0], *p = original;
+       int trimmed = 0;
+       do {
+         if (*original != ' ' || trimmed) {
+           trimmed = 1; *p++ = *original;
+         }
+       } while(*original++);
+}
+
+static void
+vcard_parse_phone(list_item item, char *line)
+{
+       char *type = vcard_get_line_element(line, VCARD_KEY_ATTRIBUTE);
+       char *value = vcard_get_line_element(line, VCARD_VALUE);
+
+       /* set the standard number */
+       if (!type) item_fput(item, PHONE, value);
+
+       /*
+        * see rfc2426 section 3.3.1
+        * Note: we probably support both vCard 2 and 3
+        */
+       else {
+               if (strcasestr(type, "home") != NULL)
+                       item_fput(item, PHONE, xstrdup(value));
+               else if (strcasestr(type, "work") != NULL)
+                       item_fput(item, WORKPHONE, xstrdup(value));
+               else if (strcasestr(type, "fax") != NULL)
+                       item_fput(item, FAX, xstrdup(value));
+               else if (strcasestr(type, "cell") != NULL)
+                       item_fput(item, MOBILEPHONE, xstrdup(value));
+
+               xfree(type);
+               xfree(value);
+       }
+}
+
+static void
+vcard_parse_line(list_item item, char *line)
+{
+       int i;
+       char *key;
+
+       for(i=0; vcard_fields[i]; i++) {
+               key = vcard_fields[i];
+
+               if(0 == strncmp(key, line, strlen(key))) {
+                       if(0 == strcmp(key, "EMAIL"))
+                               vcard_parse_email(item, line);
+                       else if(i == 2)
+                               vcard_parse_address(item, line);
+                       else if(0 == strcmp(key, "TEL"))
+                               vcard_parse_phone(item, line);
+                       else if(0 == strcmp(key, "N"))
+                               vcard_parse_name(item, line);
+                       else
+                               item[i] = vcard_get_line_element(line, VCARD_VALUE);
+                       return;
+               }
+       }
+}
+
+static void
+vcard_parse_item(FILE *in)
+{
+       char *line = NULL;
+       list_item item = item_create();
+
+       while(!feof(in)) {
+               line = getaline(in);
+
+               if(line && !strncmp("END:VCARD", line, 9)) {
+                       xfree(line);
+                       break;
+               }
+               else if(line) {
+                       vcard_parse_line(item, line);
+                       xfree(line);
+               }
+       }
+
+       add_item2database(item);
+       item_free(&item);
+}
+
+static int
+vcard_parse_file(FILE *in)
+{
+       char *line = NULL;
+
+       while(!feof(in)) {
+               line = getaline(in);
+
+               if(line && !strncmp("BEGIN:VCARD", line, 11)) {
+                       xfree(line);
+                       vcard_parse_item(in);
+               }
+               else if(line) {
+                       xfree(line);
+               }
+       }
+
+       return 0;
+}
+
+/*
+ * end of vCard import filter
+ */
+
 /*
  * csv addressbook export filters
  */
@@ -1384,6 +1731,7 @@ allcsv_export_database(FILE *out, struct db_enumerator e)
                URL,
                NOTES,
                ANNIVERSARY,
+               GROUPS,
                CSV_LAST
        };
 
@@ -1403,7 +1751,8 @@ allcsv_export_database(FILE *out, struct db_enumerator e)
        fprintf(out, "\"NICK\",");
        fprintf(out, "\"URL\",");
        fprintf(out, "\"NOTES\",");
-       fprintf(out, "\"ANNIVERSARY\"\n");
+       fprintf(out, "\"ANNIVERSARY\",");
+       fprintf(out, "\"GROUPS\"\n");
 
        csv_export_common(out, e, allcsv_export_fields, NULL);
 
@@ -1492,18 +1841,18 @@ palm_export_database(FILE *out, struct db_enumerator e)
  */
 
 /*
- * GnomeCard (VCard) addressbook export filter
+ * vCard 2 addressbook export filter
  */
 
 static int
-gcrd_export_database(FILE *out, struct db_enumerator e)
+vcard_export_database(FILE *out, struct db_enumerator e)
 {
        int j;
-       char *name;
+       char *name, *tmp;
        abook_list *emails, *em;
 
        db_enumerate_items(e) {
-               fprintf(out, "BEGIN:VCARD\nFN:%s\n",
+               fprintf(out, "BEGIN:VCARD\r\nFN:%s\r\n",
                                safe_str(db_name_get(e.item)));
 
                name = get_surname(db_name_get(e.item));
@@ -1511,7 +1860,7 @@ gcrd_export_database(FILE *out, struct db_enumerator e)
                        if((db_name_get(e.item))[j] == ' ')
                                break;
                }
-               fprintf(out, "N:%s;%.*s\n",
+               fprintf(out, "N:%s;%.*s\r\n",
                        safe_str(name),
                        j,
                        safe_str(db_name_get(e.item))
@@ -1520,7 +1869,7 @@ gcrd_export_database(FILE *out, struct db_enumerator e)
                free(name);
 
                if(db_fget(e.item, ADDRESS))
-                       fprintf(out, "ADR:;;%s;%s;%s;%s;%s;%s\n",
+                       fprintf(out, "ADR:;;%s;%s;%s;%s;%s;%s\r\n",
                                safe_str(db_fget(e.item, ADDRESS)),
                                safe_str(db_fget(e.item, ADDRESS2)),
                                safe_str(db_fget(e.item, CITY)),
@@ -1530,35 +1879,37 @@ gcrd_export_database(FILE *out, struct db_enumerator e)
                                );
 
                if(db_fget(e.item, PHONE))
-                       fprintf(out, "TEL;HOME:%s\n",
+                       fprintf(out, "TEL;HOME:%s\r\n",
                                        db_fget(e.item, PHONE));
                if(db_fget(e.item, WORKPHONE))
-                       fprintf(out, "TEL;WORK:%s\n",
+                       fprintf(out, "TEL;WORK:%s\r\n",
                                        db_fget(e.item, WORKPHONE));
                if(db_fget(e.item, FAX))
-                       fprintf(out, "TEL;FAX:%s\n",
+                       fprintf(out, "TEL;FAX:%s\r\n",
                                        db_fget(e.item, FAX));
                if(db_fget(e.item, MOBILEPHONE))
-                       fprintf(out, "TEL;CELL:%s\n",
+                       fprintf(out, "TEL;CELL:%s\r\n",
                                        db_fget(e.item, MOBILEPHONE));
 
-               if(*db_email_get(e.item)) {
-                       emails = csv_to_abook_list(db_email_get(e.item));
+               tmp = db_email_get(e.item);
+               if(*tmp) {
+                       emails = csv_to_abook_list(tmp);
 
                        for(em = emails; em; em = em->next)
-                               fprintf(out, "EMAIL;INTERNET:%s\n", em->data);
+                               fprintf(out, "EMAIL;INTERNET:%s\r\n", em->data);
 
                        abook_list_free(&emails);
                }
+               free(tmp);
 
                if(db_fget(e.item, NOTES))
-                       fprintf(out, "NOTE:%s\n",
+                       fprintf(out, "NOTE:%s\r\n",
                                        db_fget(e.item, NOTES));
                if(db_fget(e.item, URL))
-                       fprintf(out, "URL:%s\n",
+                       fprintf(out, "URL:%s\r\n",
                                        db_fget(e.item, URL));
 
-               fprintf(out, "END:VCARD\n\n");
+               fprintf(out, "END:VCARD\r\n\r\n");
 
        }
 
@@ -1566,7 +1917,7 @@ gcrd_export_database(FILE *out, struct db_enumerator e)
 }
 
 /*
- * end of GnomeCard export filter
+ * end of vCard export filter
  */
 
 
@@ -1592,25 +1943,119 @@ mutt_alias_genalias(int i)
        return tmp;
 }
 
+/*
+ * This function is a variant of abook_list_to_csv
+ * */
+static char *
+mutt_alias_gengroups(int i)
+{
+       char *groups, *res = NULL;
+       char groupstr[7] = "-group ";
+       abook_list *list, *tmp;
+
+       groups = db_fget(i, GROUPS);
+
+       if(!groups)
+               return NULL;
+
+       list = csv_to_abook_list(groups);
+       for(tmp = list; tmp; tmp = tmp->next) {
+               if(tmp == list) {
+                       res = xmalloc(strlen(groupstr)+strlen(tmp->data)+1);
+                       res = strcpy(res, groupstr);
+               } else {
+                       res = xrealloc(res, strlen(res)+1+strlen(groupstr)+strlen(tmp->data)+1);
+                       strcat(res, " ");
+                       strcat(res, groupstr);
+               }
+               strcat(res, tmp->data);
+       }
+       abook_list_free(&list);
+       xfree(groups);
+
+       return res;
+}
+
 static int
 mutt_alias_export(FILE *out, struct db_enumerator e)
 {
        char email[MAX_EMAIL_LEN];
        char *alias = NULL;
+       char *groups = NULL;
+       int email_addresses;
+       char *ptr;
 
        db_enumerate_items(e) {
-               alias = mutt_alias_genalias(e.item);
+               alias = (field_id(NICK) != -1) ? mutt_alias_genalias(e.item) : NULL;
+               groups = (field_id(GROUPS) != -1) ?  mutt_alias_gengroups(e.item) : NULL;
                get_first_email(email, e.item);
-               fprintf(out, *email ? "alias %s %s <%s>\n": "alias %s %s%s\n",
-                               alias,
-                               db_name_get(e.item),
-                               email);
-               xfree(alias);
+
+               /* do not output contacts without email address */
+               /* cause this does not make sense in mutt aliases */
+               if (*email) {
+
+                       /* output first email address */
+                       fprintf(out,"alias ");
+                       if(groups)
+                               fprintf(out, "%s ", groups);
+                       if(alias)
+                               fprintf(out, "%s ", alias);
+                       fprintf(out, "%s <%s>\n",
+                                       db_name_get(e.item),
+                                       email);
+
+                       /* number of email addresses */
+                       email_addresses = 1;
+                       ptr = db_email_get(e.item);
+                       while (*ptr != '\0') {
+                               if (*ptr == ',') {
+                                       email_addresses++;
+                               }
+                               ptr++;
+                       }
+
+                       /* output other email addresses */
+                       while (email_addresses-- > 1) {
+                               roll_emails(e.item, ROTATE_RIGHT);
+                               get_first_email(email, e.item);
+                               fprintf(out,"alias ");
+                               if( groups )
+                                       fprintf(out, "%s ", groups);
+                               if(alias)
+                                       fprintf(out, "%s__%s ", alias, email);
+                               else
+                                       fprintf(out, "%s__%s ", db_name_get(e.item), email);
+                               fprintf(out, "%s <%s>\n",
+                                               db_name_get(e.item),
+                                               email);
+                       }
+                       roll_emails(e.item, ROTATE_RIGHT);
+                       xfree(alias);
+                       xfree(groups);
+               }
        }
 
        return 0;
 }
 
+void muttq_print_item(FILE *file, int item)
+{
+       abook_list *emails, *e;
+       char *tmp = db_email_get(item);
+
+       emails = csv_to_abook_list(tmp);
+       free(tmp);
+
+       for(e = emails; e; e = e->next) {
+               fprintf(file, "%s\t%s\t%s\n", e->data, db_name_get(item),
+                               !db_fget(item, NOTES) ?" " :db_fget(item, NOTES)
+                               );
+               if(!opt_get_bool(BOOL_MUTT_RETURN_ALL_EMAILS))
+                       break;
+       }
+       abook_list_free(&emails);
+}
+
 /*
  * end of mutt alias export filter
  */
@@ -1689,7 +2134,7 @@ text_export_database(FILE * out, struct db_enumerator e)
 {
        abook_list *emails, *em;
        int j;
-       char *realname = get_real_name(), *str = NULL;
+       char *realname = get_real_name(), *str = NULL, *tmp;
        char *style = opt_get_str(STR_ADDRESS_STYLE);
 
        fprintf(out,
@@ -1706,8 +2151,9 @@ text_export_database(FILE * out, struct db_enumerator e)
                        fprintf(out, "\n(%s)", db_fget(e.item, NICK));
                fprintf(out, "\n");
 
-               if(*db_email_get(e.item)) {
-                       emails = csv_to_abook_list(db_email_get(e.item));
+               tmp = db_email_get(e.item);
+               if(*tmp) {
+                       emails = csv_to_abook_list(tmp);
 
                        fprintf(out, "\n");
                        for(em = emails; em; em = em->next)
@@ -1715,6 +2161,7 @@ text_export_database(FILE * out, struct db_enumerator e)
 
                        abook_list_free(&emails);
                }
+               free(tmp);
                /* Print address */
                if(db_fget(e.item, ADDRESS)) {
                        if(!safe_strcmp(style, "us"))   /* US like */
@@ -1734,8 +2181,8 @@ text_export_database(FILE * out, struct db_enumerator e)
                        fprintf(out, "\n");
                        for(j = PHONE; j <= MOBILEPHONE; j++)
                                if(db_fget(e.item, j)) {
-                                       get_field_keyname(field_id(j),
-                                                       NULL, &str);
+                                       get_field_info(field_id(j),
+                                                       NULL, &str, NULL);
                                        fprintf(out, "%s: %s\n", str,
                                                db_fget(e.item, j));
                                }
@@ -1795,8 +2242,8 @@ spruce_export_database (FILE *out, struct db_enumerator e)
        fprintf(out, "# This is a generated file made by abook for the Spruce e-mail client.\n\n");
 
        db_enumerate_items(e) {
-               if(strcmp(safe_str(db_email_get(e.item)), "")) {
-                       get_first_email(email, e.item);
+               get_first_email(email, e.item);
+               if(strcmp(email, "")) {
                        fprintf(out, "# Address %d\nName: %s\nEmail: %s\nMemo: %s\n\n",
                                        e.item,
                                        db_name_get(e.item),
@@ -1822,19 +2269,19 @@ spruce_export_database (FILE *out, struct db_enumerator e)
 static int
 wl_export_database(FILE *out, struct db_enumerator e)
 {
-       abook_list *emails;
+       char email[MAX_EMAIL_LEN];
 
        fprintf(out, "# Wanderlust address book written by %s\n\n", PACKAGE);
        db_enumerate_items(e) {
-               if((emails = csv_to_abook_list(db_email_get(e.item))) != NULL) {
+               get_first_email(email, e.item);
+               if(*email) {
                        fprintf(out,
                                "%s\t\"%s\"\t\"%s\"\n",
-                               emails->data,
+                               email,
                                safe_str(db_fget(e.item, NICK)),
                                safe_str(db_name_get(e.item))
                        );
                }
-               abook_list_free(&emails);
        }
 
        fprintf (out, "\n# End of address book file.\n");
@@ -1846,3 +2293,34 @@ wl_export_database(FILE *out, struct db_enumerator e)
  * end of wanderlust addressbook export filter
  */
 
+/*
+ * BSD calendar export filter
+ */
+
+static int
+bsdcal_export_database(FILE *out, struct db_enumerator e)
+{
+       db_enumerate_items(e) {
+               int year, month = 0, day = 0;
+               char *anniversary = db_fget(e.item, ANNIVERSARY);
+
+               if(anniversary) {
+                       if(!parse_date_string(anniversary, &day, &month, &year))
+                               continue;
+
+                       fprintf(out,
+                               _("%02d/%02d\tAnniversary of %s\n"),
+                               month,
+                               day,
+                               safe_str(db_name_get(e.item))
+                       );
+               }
+       }
+
+       return 0;
+}
+
+/*
+ * end of BSD calendar export filter
+ */
+