]> git.deb.at Git - pkg/abook.git/blobdiff - filter.c
ldif: cleanup ldif_convert()
[pkg/abook.git] / filter.c
index 04b9a3b5343f46f778bbd4044ec494214cc7521d..520d4ceddd5b1f248505667274dec44503145c28 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>
 #include "xmalloc.h"
 #include <assert.h>
 
+#ifdef HAVE_VFORMAT
+#include "vcard.h"
+#endif
+
 extern abook_field_list *fields_list;
 extern int fields_count;
 
@@ -44,6 +50,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,13 +62,23 @@ 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     mutt_query_export_database(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);
+static int     custom_export_database(FILE *out, struct db_enumerator e);
+
+/*
+ * export filter item prototypes
+ */
+
+void vcard_export_item(FILE *out, int item);
+void muttq_print_item(FILE *file, int item);
+void custom_print_item(FILE *out, int item);
 
 /*
  * end of function declarations
@@ -75,16 +92,18 @@ 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 },
+       { "muttq", N_("mutt query format (internal use)"), mutt_query_export_database },
        { "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},
@@ -93,9 +112,17 @@ struct abook_output_filter e_filters[] = {
        { "wl", N_("Wanderlust address book"), wl_export_database },
        { "spruce", N_("Spruce address book"), spruce_export_database },
        { "bsdcal", N_("BSD calendar"), bsdcal_export_database },
+       { "custom", N_("Custom format"), custom_export_database },
        { "\0", NULL, NULL }
 };
 
+struct abook_output_item_filter u_filters[] = {
+       { "vcard", N_("vCard 2 file"), vcard_export_item },
+       { "muttq", N_("mutt alias"), muttq_print_item },
+       { "custom", N_("Custom format"), custom_print_item },
+       { "\0", NULL }
+};
+
 /*
  * common functions
  */
@@ -105,19 +132,26 @@ print_filters()
 {
        int i;
 
-       puts(_("input:"));
+       puts(_("input formats:"));
        for(i=0; *i_filters[i].filtname ; i++)
                printf("\t%s\t%s\n", i_filters[i].filtname,
                        gettext(i_filters[i].desc));
 
        putchar('\n');
 
-       puts(_("output:"));
+       puts(_("output formats:"));
        for(i=0; *e_filters[i].filtname ; i++)
                printf("\t%s\t%s\n", e_filters[i].filtname,
                        gettext(e_filters[i].desc));
 
        putchar('\n');
+
+       puts(_("query-compatible output formats:"));
+       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
@@ -263,6 +297,18 @@ import_file(char filtname[FILTNAME_LEN], char *filename)
        if(i < 0)
                return -1;
 
+#ifdef HAVE_VFORMAT
+       // this is a special case for
+       // libvformat whose API expects a filename
+       if(!strcmp(filtname, "vcard")) {
+         if(!strcmp(filename, "-"))
+           ret = vcard_parse_file_libvformat("/dev/stdin");
+         else
+           ret = vcard_parse_file_libvformat(filename);
+       }
+       else
+#endif
+
        if(!strcmp(filename, "-")) {
                struct stat s;
                if((fstat(fileno(stdin), &s)) == -1 || S_ISDIR(s.st_mode))
@@ -357,6 +403,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)
@@ -565,16 +630,10 @@ ldif_convert(ldif_item item, char *type, char *value)
                return;
        }
 
-       for(i=0; i < LDIF_ITEM_FIELDS; i++) {
-               if(!safe_strcmp(ldif_field_names[i], type) && *value) {
-                       if(i == LDIF_ITEM_FIELDS - 1) /* this is a dirty hack */
-                               if(safe_strcmp("person", value))
-                                       break;
-
-                       if(item_fget(item, i))
-                               free(item_fget(item, i));
-
+       for(i=0; i < LDIF_ITEM_FIELDS - 1; i++) {
+                if(!strcasecmp(ldif_field_names[i], type) && *value) {
                        item_fput(item, i, xstrdup(value));
+                       break;
                }
        }
 }
@@ -634,10 +693,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 */
@@ -650,27 +710,39 @@ mutt_read_line(FILE *in, char **alias, char **rest)
        }
 
        ptr += 5;
-
        SKIPWS(ptr);
 
-       tmp = ptr;
-
-       while( ! ISSPACE(*ptr) )
-               ptr++;
-
-       alias_len = (size_t)(ptr - tmp);
+       /* 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);
+       }
 
-       if(alias)
-               *alias = xmalloc_inc(alias_len, 1);
+       if(n_groups && groups)
+               *groups = abook_list_to_csv(glist);
 
-       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;
 }
 
@@ -751,9 +823,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)) {
@@ -1330,6 +1402,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
  */
@@ -1412,6 +1756,7 @@ allcsv_export_database(FILE *out, struct db_enumerator e)
                URL,
                NOTES,
                ANNIVERSARY,
+               GROUPS,
                CSV_LAST
        };
 
@@ -1431,7 +1776,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);
 
@@ -1520,83 +1866,86 @@ 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)
+{
+  db_enumerate_items(e)
+    vcard_export_item(out, e.item);
+  return 0;
+}
+
+void
+vcard_export_item(FILE *out, int item)
 {
        int j;
        char *name, *tmp;
        abook_list *emails, *em;
+       fprintf(out, "BEGIN:VCARD\r\nFN:%s\r\n",
+               safe_str(db_name_get(item)));
 
-       db_enumerate_items(e) {
-               fprintf(out, "BEGIN:VCARD\r\nFN:%s\r\n",
-                               safe_str(db_name_get(e.item)));
-
-               name = get_surname(db_name_get(e.item));
-               for( j = strlen(db_name_get(e.item)) - 1; j >= 0; j-- ) {
-                       if((db_name_get(e.item))[j] == ' ')
-                               break;
-               }
-               fprintf(out, "N:%s;%.*s\r\n",
-                       safe_str(name),
-                       j,
-                       safe_str(db_name_get(e.item))
-                       );
-
-               free(name);
-
-               if(db_fget(e.item, ADDRESS))
-                       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)),
-                               safe_str(db_fget(e.item, STATE)),
-                               safe_str(db_fget(e.item, ZIP)),
-                               safe_str(db_fget(e.item, COUNTRY))
-                               );
-
-               if(db_fget(e.item, PHONE))
-                       fprintf(out, "TEL;HOME:%s\r\n",
-                                       db_fget(e.item, PHONE));
-               if(db_fget(e.item, WORKPHONE))
-                       fprintf(out, "TEL;WORK:%s\r\n",
-                                       db_fget(e.item, WORKPHONE));
-               if(db_fget(e.item, FAX))
-                       fprintf(out, "TEL;FAX:%s\r\n",
-                                       db_fget(e.item, FAX));
-               if(db_fget(e.item, MOBILEPHONE))
-                       fprintf(out, "TEL;CELL:%s\r\n",
-                                       db_fget(e.item, MOBILEPHONE));
-
-               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\r\n", em->data);
-
-                       abook_list_free(&emails);
-               }
-               free(tmp);
-
-               if(db_fget(e.item, NOTES))
-                       fprintf(out, "NOTE:%s\r\n",
-                                       db_fget(e.item, NOTES));
-               if(db_fget(e.item, URL))
-                       fprintf(out, "URL:%s\r\n",
-                                       db_fget(e.item, URL));
+       name = get_surname(db_name_get(item));
+       for( j = strlen(db_name_get(item)) - 1; j >= 0; j-- ) {
+         if((db_name_get(item))[j] == ' ')
+           break;
+       }
+       fprintf(out, "N:%s;%.*s\r\n",
+               safe_str(name),
+               j,
+               safe_str(db_name_get(item))
+               );
+
+       free(name);
+
+       if(db_fget(item, ADDRESS))
+         fprintf(out, "ADR:;;%s;%s;%s;%s;%s;%s\r\n",
+                 safe_str(db_fget(item, ADDRESS)),
+                 safe_str(db_fget(item, ADDRESS2)),
+                 safe_str(db_fget(item, CITY)),
+                 safe_str(db_fget(item, STATE)),
+                 safe_str(db_fget(item, ZIP)),
+                 safe_str(db_fget(item, COUNTRY))
+                 );
+
+       if(db_fget(item, PHONE))
+         fprintf(out, "TEL;HOME:%s\r\n",
+                 db_fget(item, PHONE));
+       if(db_fget(item, WORKPHONE))
+         fprintf(out, "TEL;WORK:%s\r\n",
+                 db_fget(item, WORKPHONE));
+       if(db_fget(item, FAX))
+         fprintf(out, "TEL;FAX:%s\r\n",
+                 db_fget(item, FAX));
+       if(db_fget(item, MOBILEPHONE))
+         fprintf(out, "TEL;CELL:%s\r\n",
+                 db_fget(item, MOBILEPHONE));
+
+       tmp = db_email_get(item);
+       if(*tmp) {
+         emails = csv_to_abook_list(tmp);
+
+         for(em = emails; em; em = em->next)
+           fprintf(out, "EMAIL;INTERNET:%s\r\n", em->data);
+
+         abook_list_free(&emails);
+       }
+       free(tmp);
 
-               fprintf(out, "END:VCARD\r\n\r\n");
+       if(db_fget(item, NOTES))
+         fprintf(out, "NOTE:%s\r\n",
+                 db_fget(item, NOTES));
+       if(db_fget(item, URL))
+         fprintf(out, "URL:%s\r\n",
+                 db_fget(item, URL));
 
-       }
+       fprintf(out, "END:VCARD\r\n\r\n");
 
-       return 0;
 }
 
 /*
- * end of GnomeCard export filter
+ * end of vCard export filter
  */
 
 
@@ -1622,25 +1971,128 @@ 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);
+}
+
+static int
+mutt_query_export_database(FILE *out, struct db_enumerator e)
+{
+  fprintf(out, "All items\n");
+  db_enumerate_items(e)
+    muttq_print_item(out, e.item);
+  return 0;
+}
+
 /*
  * end of mutt alias export filter
  */
@@ -1890,7 +2342,8 @@ bsdcal_export_database(FILE *out, struct db_enumerator e)
                char *anniversary = db_fget(e.item, ANNIVERSARY);
 
                if(anniversary) {
-                       parse_date_string(anniversary, &day, &month, &year);
+                       if(!parse_date_string(anniversary, &day, &month, &year))
+                               continue;
 
                        fprintf(out,
                                _("%02d/%02d\tAnniversary of %s\n"),
@@ -1904,6 +2357,176 @@ bsdcal_export_database(FILE *out, struct db_enumerator e)
        return 0;
 }
 
+// see enum field_types @database.h
+static char *conv_table[] = {
+  "name",
+  "email",
+  "address",
+  "address2",
+  "city",
+  "state",
+  "zip",
+  "country",
+  "phone",
+  "workphone",
+  "fax",
+  "mobile",
+  "nick",
+  "url",
+  "notes",
+  "anniversary",
+  0 /* ITEM_FIELDS */
+};
+
+static int
+find_field_enum(char *s) {
+  int i = 0;
+  while (conv_table[i]) {
+    if(!safe_strcmp(conv_table[i], s))
+      return i;
+    i++;
+  }
+  // failed
+  return -1;
+}
+
+/* Convert a string with named placeholders to
+   a *printf() compatible string.
+   Stores the abook field values into ft. */
+void
+parse_custom_format(char *s, char *fmt_string, enum field_types *ft)
+{
+       if(! fmt_string || ! ft) {
+         fprintf(stderr, _("parse_custom_format: fmt_string or ft not allocated\n"));
+         exit(EXIT_FAILURE);
+       }
+
+       char *p, *start, *field_name = NULL;
+       p = start = s;
+
+       while(*p) {
+               if(*p == '{') {
+                 start = ++p;
+                 p = strchr(start, '}');
+                 if(! *p) {
+                   fprintf(stderr, _("parse_custom_format: invalid format\n"));
+                   exit(EXIT_FAILURE);
+                 }
+                 strcat(fmt_string, "%s");
+                 field_name = strndup(start, (size_t)(p-start));
+                 *ft = find_field_enum(field_name);
+                 if(*ft == -1) {
+                   fprintf(stderr, _("parse_custom_format: invalid placeholder: {%s}\n"), field_name);
+                   exit(EXIT_FAILURE);
+                 }
+
+                 ft++;
+                 p++;
+                 start = p;
+               } else {
+                 p = strchr(start, '{');
+                 if(p && *p) {
+                   strncat(fmt_string, start, (size_t)(p-start));
+                   start = p;
+                 }
+                 else {
+                   strncat( fmt_string,
+                            start,
+                            FORMAT_STRING_LEN - strlen(fmt_string) - 1 );
+                   break;
+                 }
+               }
+       }
+       *ft = 66;
+}
+
+static int
+custom_export_item(FILE *out, int item, char *s, enum field_types *ft);
+
+
+// used to store the format string from --outformatstr when "custom" format is used
+// default value overriden in export_file()
+extern char *parsed_custom_format;
+extern enum field_types *custom_format_fields;
+
+/* wrapper for custom_export_item:
+   1) avoid messing with extern pointer
+   2) adds \n
+   3) follow the prototype needed for an abook_output_item_filter entry */
+void
+custom_print_item(FILE *out, int item)
+{
+
+  if(custom_export_item(out, item, parsed_custom_format, custom_format_fields) == 0)
+    fprintf(out, "\n");
+}
+
+static int
+custom_export_item(FILE *out, int item, char *fmt, enum field_types *ft)
+{
+  char *p, *q = 0;
+
+  // if the first character is '!':
+  // we first check that all fields exist before continuing
+  if(*fmt == '!') {
+    enum field_types *ftp = ft;
+    while(*ft != 66) {
+      if(! db_fget(item, *ft) )
+       return 1;
+      ft++;
+    }
+    ft = ftp;
+    fmt++;
+  }
+
+  while (*fmt) {
+    if(!strncmp(fmt, "%s", 2)) {
+      fprintf(out, "%s", safe_str(db_fget(item, *ft)));
+      ft++;
+      fmt+=2;
+    } else if (*ft == 66) {
+      fprintf(out, "%s", fmt);
+      return 0;
+    } else {
+      p = strchr(fmt, '%');
+      if(*p) {
+       q = strndup(fmt, (size_t)(p-fmt));
+       fprintf(out, "%s", q);
+       free(q);
+       fmt = p;
+      }
+      else {
+       fprintf(out, "%s", fmt);
+       return 0;
+      }
+    }
+  }
+
+  return 0;
+}
+
+// used to store the format string from --outformatstr when "custom" format is used
+// default value overriden from abook.c
+extern char custom_format[FORMAT_STRING_LEN];
+
+static int
+custom_export_database(FILE *out, struct db_enumerator e)
+{
+       char *format_string =
+         (char *)malloc(FORMAT_STRING_LEN * sizeof(char*));
+
+       enum field_types *ft =
+         (enum field_types *)malloc(FORMAT_STRING_MAX_FIELDS * sizeof(enum field_types *));
+
+       parse_custom_format(custom_format, format_string, ft);
+
+       db_enumerate_items(e) {
+         if(custom_export_item(out, e.item, format_string, ft) == 0)
+           fprintf(out, "\n");
+       }
+       return 0;
+}
+
 /*
  * end of BSD calendar export filter
  */