X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=filter.c;h=6946f9a5da0fbe6ac685bb411562530a9ecb99f2;hb=b281ff74163f08f1a665108b55ce25ee0cdca32a;hp=1f171722673733c6d5f17a7fcd3cab494d113c44;hpb=7d7ae6aab5fb6307328b7cfb193ebce3e2870624;p=pkg%2Fabook.git
diff --git a/filter.c b/filter.c
index 1f17172..6946f9a 100644
--- a/filter.c
+++ b/filter.c
@@ -61,6 +61,7 @@ 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
@@ -91,6 +92,7 @@ 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 }
};
@@ -832,37 +834,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, "%s", 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, "\n| "
- "%s"
- " | \n",
- tmp,
- db_name_get(e.item));
- else
- fprintf(out, "
\n| %s | \n", db_name_get(e.item));
+ html_export_write_head(out);
- fprintf(out, "%s | \n", db_email_get(e.item));
- if(extra_column >= 0)
- fprintf(out, "%s | \n",
- safe_str(db_fget_byid(e.item, extra_column)));
- fprintf(out, "
\n\n");
+ db_enumerate_items(e) {
+ fprintf(out, "");
+ 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, "| ");
+ html_print_emails(out, &f);
+ fprintf(out, " | ");
+ continue;
+ } else {
+ fprintf(out, "%s | ", safe_str(f.data));
+ }
+ }
+ fprintf(out, "
\n");
}
html_export_write_tail(out);
@@ -871,9 +892,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, "\n");
fprintf(out, "\n\n %s's addressbook",
@@ -882,11 +904,13 @@ html_export_write_head(FILE *out, int extra_column)
fprintf(out, "\n%s's addressbook
\n", realname );
fprintf(out, "
\n\n");
- fprintf(out, "\n");
- fprintf(out, "\n| Name | E-mail address(es) | ");
- if(extra_column >= 0) {
- get_field_keyname(extra_column, NULL, &extra_column_name);
- fprintf(out, "%s | ", safe_str(extra_column_name));
+ fprintf(out, "\n");
+ 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, "| %s | ", str);
}
fprintf(out, "
\n\n");
@@ -916,7 +940,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 +953,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 +1059,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;
@@ -1499,11 +1527,11 @@ static int
gcrd_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 +1539,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 +1548,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 +1558,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");
}
@@ -1597,15 +1627,46 @@ mutt_alias_export(FILE *out, struct db_enumerator e)
{
char email[MAX_EMAIL_LEN];
char *alias = NULL;
+ int email_addresses;
+ char *ptr;
db_enumerate_items(e) {
alias = mutt_alias_genalias(e.item);
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 %s %s <%s>\n",
+ alias,
+ 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 %s__%s %s <%s>\n",
+ alias,
+ email,
+ db_name_get(e.item),
+ email);
+ }
+ roll_emails(e.item, ROTATE_RIGHT);
+ xfree(alias);
+ }
}
return 0;
@@ -1689,7 +1750,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 +1767,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 +1777,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 +1797,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 +1858,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 +1885,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 +1909,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
+ */
+
|---|