X-Git-Url: https://git.deb.at/w?p=pkg%2Fabook.git;a=blobdiff_plain;f=filter.c;h=2ea5a2dd77bfa3acafa196f5f324a7b47cee2ed6;hp=20c89739623de515398e183a4873d247d0b36f0e;hb=69a912c0db0ac135fff332db4f0b05ad9ed2eec6;hpb=4f4b00f8dd2fee76efe3d068d4fdfdb714d1d39f
diff --git a/filter.c b/filter.c
index 20c8973..2ea5a2d 100644
--- a/filter.c
+++ b/filter.c
@@ -35,6 +35,8 @@
extern abook_field_list *fields_list;
extern int fields_count;
+// see also enum field_types @database.h
+extern abook_field standard_fields[];
/*
* function declarations
@@ -1067,23 +1069,26 @@ html_export_database(FILE *out, struct db_enumerator e)
html_export_write_head(out);
db_enumerate_items(e) {
- fprintf(out, "");
+ fprintf(out, "
\n");
for(cur = index_elements; cur; cur = cur->next) {
if(cur->type != INDEX_FIELD)
continue;
-
+
get_list_field(e.item, cur, &f);
+ fprintf(out, " | ");
+
if(f.type == FIELD_EMAILS) {
- fprintf(out, " | ");
html_print_emails(out, &f);
- fprintf(out, " | ");
- continue;
} else {
- fprintf(out, "%s | ", safe_str(f.data));
+ if (strcmp(safe_str(f.data), "") == 0)
+ fprintf(out, " ");
+ else
+ fprintf(out, "%s", safe_str(f.data));
}
+ fprintf(out, "\n");
}
- fprintf(out, "
\n");
+ fprintf(out, " \n");
}
html_export_write_tail(out);
@@ -1097,22 +1102,45 @@ html_export_write_head(FILE *out)
char *realname = get_real_name(), *str;
struct index_elem *cur;
- fprintf(out, "\n");
- fprintf(out, "\n\n %s's addressbook",
- realname );
- fprintf(out, "\n\n\n");
- fprintf(out, "\n%s's addressbook
\n", realname );
- fprintf(out, "
\n\n");
-
- fprintf(out, "\n");
+ fprintf(out, "\n");
+ fprintf(out, "\n");
+ fprintf(out, "\n");
+ fprintf(out, " \n");
+ fprintf(out, " ");
+ fprintf(out, _("%s's addressbook"), realname );
+ fprintf(out, "\n");
+ fprintf(out, " \n");
+ fprintf(out, "\n");
+ fprintf(out, "\n");
+ fprintf(out, "");
+ fprintf(out, _("%s's addressbook"), realname);
+ fprintf(out, "
\n");
+
+ fprintf(out, "\n");
+ fprintf(out, "\n");
+ 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, " ");
+
+ if (strcmp(str, "") == 0)
+ fprintf(out, " ");
+ else
+ fprintf(out, "%s", str);
+
+ fprintf(out, " | \n");
}
- fprintf(out, "
\n\n");
+ fprintf(out, " \n");
+ fprintf(out, "\n");
+ fprintf(out, "\n");
free(realname);
}
@@ -1120,8 +1148,9 @@ html_export_write_head(FILE *out)
static void
html_export_write_tail(FILE *out)
{
- fprintf(out, "\n
\n");
- fprintf(out, "\n\n\n");
+ fprintf(out, "
\n");
+ fprintf(out, "\n");
+ fprintf(out, "");
}
/*
@@ -1285,6 +1314,11 @@ pine_export_database(FILE *out, struct db_enumerator e)
* csv import filter
*/
+/* This is used by both allcsv_export_database() and csv_export_common()
+ to distinguish between standard and defined fields.
+ To avoid confusions this should stay > ITEM_FIELDS */
+#define CUSTOM_FIELD_START_INDEX (ITEM_FIELDS + 10)
+
/* FIXME
* these files should be parsed according to a certain
* lay out, or the default if layout is not given, at
@@ -1550,8 +1584,9 @@ static char *vcard_fields[] = {
"NICKNAME", /* NICK */
"URL", /* URL */
"NOTE", /* NOTES */
+ "BDAY", /* ANNIVERSARY */
"N", /* NAME: special case/mapping in vcard_parse_line() */
- NULL /* not implemented: ANNIVERSARY, ITEM_FIELDS */
+ NULL /* ITEM_FIELDS */
};
enum {
@@ -1653,20 +1688,33 @@ vcard_parse_address(list_item item, char *line)
// vCard(post office box) - not used
strsep(&value, ";");
+ if(!value) return;
+
// vCard(the extended address)
item_fput(item, ADDRESS2, xstrdup(strsep(&value, ";")));
+ if(!value) return;
+
// vCard(the street address)
item_fput(item, ADDRESS, xstrdup(strsep(&value, ";")));
+ if(!value) return;
+
// vCard(the locality)
item_fput(item, CITY, xstrdup(strsep(&value, ";")));
+ if(!value) return;
+
// vCard(the region)
item_fput(item, STATE, xstrdup(strsep(&value, ";")));
+ if(!value) return;
+
// vCard(the postal code)
item_fput(item, ZIP, xstrdup(strsep(&value, ";")));
+ if(!value) return;
+
// vCard(the country name)
item_fput(item, COUNTRY, xstrdup(strsep(&value, ";")));
- if(*value) xfree(value);
+ // support of optional trailing ";" to the ADR field
+ if(value && *value) xfree(value);
}
static void
@@ -1813,7 +1861,12 @@ csv_export_common(FILE *out, struct db_enumerator e,
else if(CSV_IS_SPECIAL(fields[i])) {
if(special_func)
(*special_func)(out, e.item, fields[i]);
- } else
+ }
+ else if(fields[i] >= CUSTOM_FIELD_START_INDEX) {
+ fprintf(out, "\"%s\"",
+ safe_str(db_fget_byid(e.item, fields[i] - CUSTOM_FIELD_START_INDEX)));
+ }
+ else
/*fprintf(out,(
strchr(safe_str(database[e.item][field_idx(fields[i])]), ',') ||
strchr(safe_str(database[e.item][field_idx(fields[i])]), '\"')) ?
@@ -1856,7 +1909,7 @@ allcsv_export_database(FILE *out, struct db_enumerator e)
* TODO: Should get these atomatically from abook_fileds
* - JH
*/
- int allcsv_export_fields[] = {
+ int allcsv_export_fields[ITEM_FIELDS + 6] = { // only the 5 custom fields are allowed so far
NAME,
EMAIL,
ADDRESS,
@@ -1868,7 +1921,7 @@ allcsv_export_database(FILE *out, struct db_enumerator e)
PHONE,
WORKPHONE,
FAX,
- MOBILEPHONE,
+ MOBILEPHONE, // spelt "mobile" in standard_fields
NICK,
URL,
NOTES,
@@ -1878,23 +1931,47 @@ allcsv_export_database(FILE *out, struct db_enumerator e)
};
fprintf(out, "#");
- fprintf(out, "\"NAME\",");
- fprintf(out, "\"EMAIL\",");
- fprintf(out, "\"ADDRESS\",");
- fprintf(out, "\"ADDRESS2\",");
- fprintf(out, "\"CITY\",");
- fprintf(out, "\"STATE\",");
- fprintf(out, "\"ZIP\",");
- fprintf(out, "\"COUNTRY\",");
- fprintf(out, "\"PHONE\",");
- fprintf(out, "\"WORKPHONE\",");
- fprintf(out, "\"FAX\",");
- fprintf(out, "\"MOBILEPHONE\",");
- fprintf(out, "\"NICK\",");
- fprintf(out, "\"URL\",");
- fprintf(out, "\"NOTES\",");
- fprintf(out, "\"ANNIVERSARY\",");
- fprintf(out, "\"GROUPS\"\n");
+ int i = 0;
+ while(allcsv_export_fields[i+1] != CSV_LAST) {
+ fprintf(out, "\"%s\",", standard_fields[i++].key);
+ }
+ fprintf(out, "\"%s\"", standard_fields[i].key);
+
+ /*
+ Custom fields handling:
+ This loop appends custom fields' id at the end of allcsv_export_fields and shift
+ the CSV_LAST sentinel value each time one is found.
+ CUSTOM_FIELD_START_INDEX is added to these index values so csv_export_common()
+ can later recognize them and call db_fget_byid() instead of the traditional db_fget()
+
+ It only search for defined the [legacy?] "custom" fields.
+ */
+
+ // pointer to the end of the field list
+ int append_field = ITEM_FIELDS;
+ // custom field's trailing number (between 1 and 5)
+ int j;
+ // full custom field name, eg "custom4"
+ char custom_field_key[8];
+ // index used by custom_field_key
+ int field_no;
+ // name of the defined field as chosen by the user
+ char *custom_field_name;
+
+ for (j = 1; j <= 5; j++) {
+ snprintf(custom_field_key, 8, "custom%d", j++);
+ if(find_declared_field(custom_field_key)) {
+ find_field_number(custom_field_key, &field_no);
+ get_field_info(field_no, NULL, &custom_field_name, NULL);
+ // append the field to the list
+ allcsv_export_fields[append_field] = field_no + CUSTOM_FIELD_START_INDEX;
+ allcsv_export_fields[++append_field] = CSV_LAST;
+ // print column name
+ fprintf(out, ",\"%s\"", custom_field_name);
+ }
+ }
+ free(custom_field_name);
+ fprintf(out, "\n");
csv_export_common(out, e, allcsv_export_fields, NULL);
@@ -2016,6 +2093,13 @@ vcard_export_item(FILE *out, int item)
free(name);
+ if(db_fget(item, NICK))
+ fprintf(out, "NICKNAME:%s\r\n",
+ safe_str(db_fget(item, NICK)));
+ if(db_fget(item, ANNIVERSARY))
+ fprintf(out, "BDAY:%s\r\n",
+ safe_str(db_fget(item, ANNIVERSARY)));
+
// see rfc6350 section 6.3.1
if(db_fget(item, ADDRESS)) {
fprintf(out, "ADR:;%s;%s;%s;%s;%s;%s\r\n",
@@ -2478,8 +2562,6 @@ bsdcal_export_database(FILE *out, struct db_enumerator e)
return 0;
}
-// see also enum field_types @database.h
-extern abook_field standard_fields[];
static int
find_field_enum(char *s) {
int i = -1;
@@ -2565,7 +2647,7 @@ parse_custom_format(char *s, char *fmt_string, enum field_types *ft)
cannotparse:
fprintf(stderr, _("%s: invalid format, index %ld\n"), __FUNCTION__, (start - s));
free(fmt_string);
- while(*ft) free(ft--);
+ free(ft);
exit(EXIT_FAILURE);
}
@@ -2641,11 +2723,10 @@ 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*));
+ char *format_string = (char *)malloc(FORMAT_STRING_LEN);
enum field_types *ft =
- (enum field_types *)malloc(FORMAT_STRING_MAX_FIELDS * sizeof(enum field_types *));
+ (enum field_types *)malloc(FORMAT_STRING_MAX_FIELDS * sizeof(enum field_types));
parse_custom_format(custom_format, format_string, ft);