- palmcsv import filter (Marc Tardif)

- use better common code for csv filters (Marc Tardif)

diff --git a/ChangeLog b/ChangeLog
index 148d6961998f61af42e8b9c72d7acb5ed6ef166b..716591b1ea1fb37abd55a885ca0c578b0ec91a98 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+0.5.5
+ - palmcsv import filter (Marc Tardif)
+ - use better common code for csv filters (Marc Tardif)
+
 0.5.4
  - add show_cursor config option (idea from Cheryl Homiak)
  - autoconf/automake update

diff --git a/THANKS b/THANKS
index 8a7017a0a37667bc8cfb1d1d120a6834bc84c59c..490f4e6934a43c012ad31ba45ce8757ec32aa52a 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -18,5 +18,6 @@ Morten Brix Pedersen
 Jeff Covey
 Giuseppe Corbelli
 Mariusz Balewski
+Marc Tardif
 
 See also AUTHORS

diff --git a/abook.1 b/abook.1
index 42e0b5fea956a29da890ac76e1461eda3b121bce..b9f156d8b68f706ec068f4f5e704c2ea66049694 100644 (file)
--- a/abook.1
+++ b/abook.1
@@ -50,6 +50,8 @@ The following \fIinputformats\fR are supported:
 - \fBpine\fP pine addressbook
 .br
 - \fBcsv\fP comma separated values
+.br
+- \fBpalmcsv\fP Palm comma separated values
 
 .br
 The following \fIoutputformats\fR are supported:

diff --git a/filter.c b/filter.c
index a69a98fff9614d1abc84febd617fe5baf30ee3f1..34f35b1ac0e7ff39ff85230b4cd938d9c21588cc 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -42,6 +42,7 @@ static int    mutt_parse_file(FILE *in);
 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);
 
 /*
  * export filter prototypes
@@ -70,6 +71,7 @@ struct abook_input_filter i_filters[] = {
        { "pine", "pine addressbook", pine_parse_file },
        { "csv", "comma separated values", csv_parse_file },
        { "allcsv", "comma separated all values", allcsv_parse_file },
+       { "palmcsv", "Palm comma separated values", palmcsv_parse_file },
        { "\0", NULL, NULL }
 };
 
@@ -601,7 +603,7 @@ ldif_fix_string(char *str)
 {
        int i, j;
 
-       for( i = 0, j = 0; j < (int)strlen(str); i++, j++)
+       for(i = 0, j = 0; j < (int)strlen(str); i++, j++)
                str[i] = ( str[j] == (char)0xc3 ?
                                (char) str[++j] + (char) 0x40 :
                                str[j] );
@@ -1043,6 +1045,8 @@ pine_export_database(FILE *out, struct db_enumerator e)
  */
 
 #define CSV_COMMENT_CHAR       '#'
+#define CSV_DUPLICATE_SEPARATOR        " "
+#define CSV_TABLE_SIZE(t)      (sizeof (t) / sizeof *(t))
 
 static int csv_conv_table[] = {
        NAME,
@@ -1075,6 +1079,28 @@ static int allcsv_conv_table[] = {
        CUSTOM5,
 };
 
+static int palmcsv_conv_table[] = {
+       NAME,           /* Last name */
+       NAME,           /* First name */
+       NOTES,          /* Title */
+       NICK,           /* Company */
+       WORKPHONE,
+       PHONE,
+       FAX,
+       MOBILEPHONE,
+       EMAIL,
+       ADDRESS,
+       CITY,
+       STATE,
+       ZIP,
+       COUNTRY,
+       CUSTOM1,
+       CUSTOM2,
+       CUSTOM3,
+       CUSTOM4,
+       CUSTOM5,
+};
+
 static void
 csv_convert_emails(char *s)
 {
@@ -1084,7 +1110,7 @@ csv_convert_emails(char *s)
        if(s == NULL)
                return;
 
-       for(i = 1; ( tmp = strchr(s, ',') ) != NULL ; i++, s = tmp + 1 )
+       for(i = 1; ( tmp = strchr(s, ',') ) != NULL ; i++, s = tmp + 1)
                if(i > MAX_EMAILS - 1) {
                        *tmp = 0;
                        break;
@@ -1118,27 +1144,17 @@ csv_remove_quotes(char *s)
        return xstrdup(s);
 }
 
-static void
-csv_store_field(list_item item, char *s, int field)
+static int
+csv_field_to_item(int *table_base, size_t table_size, int field)
 {
-       char *newstr = NULL;
+       if(field < table_size)
+               return table_base[field];
 
-       if(!s || !*s)
-               return;
-
-       if( !(newstr = csv_remove_quotes(s)) )
-               return;
-
-       if(field < (int)(sizeof(csv_conv_table) / sizeof(*csv_conv_table))
-                       && csv_conv_table[field] >= 0) {
-               item[csv_conv_table[field]] = newstr;
-       } else {
-               xfree(newstr);
-       }
+       return -1;
 }
 
 static void
-allcsv_store_field(list_item item, char *s, int field)
+csv_store_item(list_item item, int i, char *s)
 {
        char *newstr = NULL;
 
@@ -1148,9 +1164,17 @@ allcsv_store_field(list_item item, char *s, int field)
        if( !(newstr = csv_remove_quotes(s)) )
                return;
 
-       if(field < (int)(sizeof(allcsv_conv_table) / sizeof(*allcsv_conv_table))
-                       && allcsv_conv_table[field] >= 0) {
-               item[allcsv_conv_table[field]] = newstr;
+       if(i >= 0) {
+               if (item[i] != NULL) {
+                       char *oldstr = item[i];
+
+                       item[i] = strconcat(newstr, CSV_DUPLICATE_SEPARATOR,
+                               oldstr, NULL);
+                       xfree(newstr);
+                       xfree(oldstr);
+               } else {
+                       item[i] = newstr;
+               }
        } else {
                xfree(newstr);
        }
@@ -1186,7 +1210,7 @@ csv_is_valid_quote_start(char *p)
 }
 
 static void
-csv_parse_line(char *line)
+csv_parse_line(char *line, int *table_base, size_t table_size)
 {
        char *p, *start;
        int field;
@@ -1205,9 +1229,13 @@ csv_parse_line(char *line)
                                in_quote = TRUE;
                }
 
-               if( *p == ',' && !in_quote) {
+               if(*p == ',' && !in_quote) {
                        *p = 0;
-                       csv_store_field(item, start, field);
+                       csv_field_to_item(table_base, table_size, field);
+                       csv_store_item(item,
+                               csv_field_to_item(table_base,
+                                                       table_size, field),
+                               start);
                        field++;
                        start = p + 1;
                }
@@ -1215,51 +1243,15 @@ csv_parse_line(char *line)
        /*
         * store last field
         */
-       csv_store_field(item, start, field);
+       csv_store_item(item, csv_field_to_item(table_base, table_size, field),
+               start);
 
        csv_convert_emails(item[EMAIL]);
        add_item2database(item);
 }
 
-static void
-allcsv_parse_line(char *line)
-{
-       char *p, *start;
-       int field;
-       bool in_quote = FALSE;
-       list_item item;
-
-       memset(item, 0, sizeof(item));
-
-       for(p = start = line, field = 0; *p; p++) {
-               if(in_quote) {
-                       if(csv_is_valid_quote_end(p))
-                               in_quote = FALSE;
-               } else {
-                       if ( (((p - start) / sizeof (char)) < 2 ) &&
-                               csv_is_valid_quote_start(p) )
-                               in_quote = TRUE;
-               }
-
-               if( *p == ',' && !in_quote) {
-                       *p = 0;
-                       allcsv_store_field(item, start, field);
-                       field++;
-                       start = p + 1;
-               }
-       }
-       /*
-        * store last field
-        */
-       allcsv_store_field(item, start, field);
-
-       csv_convert_emails(item[EMAIL]);
-       add_item2database(item);
-}
-
-
 static int
-csv_parse_file(FILE *in)
+csv_parse_file_common(FILE *in, int *conv_table, size_t table_size)
 {
        char *line = NULL;
 
@@ -1267,7 +1259,7 @@ csv_parse_file(FILE *in)
                line = getaline(in);
 
                if(line && *line && *line != CSV_COMMENT_CHAR)
-                       csv_parse_line(line);
+                       csv_parse_line(line, conv_table, table_size);
 
                xfree(line);
        }
@@ -1276,20 +1268,24 @@ csv_parse_file(FILE *in)
 }
 
 static int
-allcsv_parse_file(FILE *in)
+csv_parse_file(FILE *in)
 {
-       char *line = NULL;
-
-       while(!feof(in)) {
-               line = getaline(in);
-
-               if(line && *line && *line != CSV_COMMENT_CHAR)
-                       allcsv_parse_line(line);
+       return csv_parse_file_common(in, csv_conv_table,
+               CSV_TABLE_SIZE(csv_conv_table));
+}
 
-               xfree(line);
-       }
+static int
+allcsv_parse_file(FILE *in)
+{
+       return csv_parse_file_common(in, allcsv_conv_table,
+               CSV_TABLE_SIZE(allcsv_conv_table));
+}
 
-       return 0;
+static int
+palmcsv_parse_file(FILE *in)
+{
+       return csv_parse_file_common(in, palmcsv_conv_table,
+               CSV_TABLE_SIZE(palmcsv_conv_table));
 }
 
 /*