X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=filter.c;h=5d20a3743c42471bc455b3bac120edac0e57a162;hb=4f7637954591ecfb575642709bd12a069ee90aab;hp=15370fbf7d606ae64e6043b5a990e9baf4e77d5d;hpb=c0217523d30a32c86e495066655a5c528f5cc772;p=pkg%2Fabook.git diff --git a/filter.c b/filter.c index 15370fb..5d20a37 100644 --- a/filter.c +++ b/filter.c @@ -2,7 +2,7 @@ /* * $Id$ * - * by JH + * by JH * * Copyright (C) Jaakko Heinonen */ @@ -21,6 +21,7 @@ #include "list.h" #include "misc.h" #include "options.h" +#include extern int items; extern list_item *database; @@ -37,6 +38,7 @@ extern struct abook_field abook_fields[]; 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); /* * export filter prototypes @@ -61,6 +63,7 @@ struct abook_input_filter i_filters[] = { { "ldif", "ldif / Netscape addressbook", ldif_parse_file }, { "mutt", "mutt alias (beta)", mutt_parse_file }, { "pine", "pine addressbook", pine_parse_file }, + { "csv", "comma separated values", csv_parse_file }, { "\0", NULL, NULL } }; @@ -134,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); @@ -647,7 +650,7 @@ 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) return 1; strncpy(*alias, tmp, ptr-tmp); @@ -820,10 +823,14 @@ html_export_database(FILE *out, struct db_enumerator e) db_enumerate_items(e) { get_first_email(tmp, e.item); - fprintf(out, "\n%s\n", - tmp, - database[e.item][NAME] ); - + if (*tmp) + fprintf(out, "\n%s\n", + tmp, + database[e.item][NAME] ); + else + fprintf(out, "\n%s>\n", + database[e.item][NAME] ); + fprintf(out, "%s\n%s\n", database[e.item][EMAIL], safe_str(database[e.item][extra_column]) ); @@ -896,7 +903,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; } @@ -950,7 +957,7 @@ pine_parse_file(FILE *in) while(!feof(in)) { for(i=2;;i++) { - buf = realloc(buf, i*LINESIZE); + buf = (char *) realloc(buf, i*LINESIZE); if(i==2) strcpy(buf, line); fgets(line, LINESIZE, in); @@ -962,8 +969,10 @@ pine_parse_file(FILE *in) strcat(buf, ptr); } - if( *buf == '#' ) + if( *buf == '#' ) { + my_free(buf); continue; + } pine_fixbuf(buf); pine_parse_buf(buf); @@ -1007,6 +1016,173 @@ pine_export_database(FILE *out, struct db_enumerator e) */ +/* + * 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 < (sizeof(csv_conv_table) / sizeof(*csv_conv_table)) + && csv_conv_table[field] >= 0) { + item[csv_conv_table[field]] = 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; + int in_quote = FALSE; + list_item item; + + memset(item, 0, sizeof(item)); + + for(p = start = line, field = 0; *p; p++) { + if(!in_quote) { + if ( (((p - start) / sizeof (char)) < 2 ) && + csv_is_valid_quote_start(p) ) + in_quote = TRUE; + } else { + if(csv_is_valid_quote_end(p)) + in_quote = FALSE; + } + + 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 */ @@ -1020,12 +1196,16 @@ csv_export_database(FILE *out, struct db_enumerator e) EMAIL, PHONE, NOTES, + NICK, -1 }; db_enumerate_items(e) { for(j = 0; csv_export_fields[j] >= 0; j++) { - fprintf(out, strchr(safe_str(database[e.item][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[e.item][csv_export_fields[j]]) ); @@ -1218,14 +1398,8 @@ text_write_address_eu(FILE *out, int i) { if(database[i][CITY]) fprintf(out, "%s", 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]);