X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=database.c;h=5da2e93eced4b440c54ac3accaa2713d9a92d264;hb=7a7531e544d236d58ca077ce56b7d6d0c60faa09;hp=a2c396dedb3a676033f85f870b842fc3dbf67112;hpb=3212da92838c056bcc1cafa57beaf26086e2ac96;p=pkg%2Fabook.git diff --git a/database.c b/database.c index a2c396d..5da2e93 100644 --- a/database.c +++ b/database.c @@ -2,7 +2,7 @@ /* * $Id$ * - * by JH + * by JH * * Copyright (C) Jaakko Heinonen */ @@ -13,11 +13,13 @@ #include #include #include "abook.h" +#include #include "database.h" #include "list.h" #include "misc.h" #include "options.h" #include "filter.h" +#include "xmalloc.h" #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -58,6 +60,7 @@ struct abook_field abook_fields[ITEM_FIELDS] = { {"Name", "name", TAB_CONTACT},/* NAME */ {"E-mails", "email", TAB_CONTACT},/* EMAIL */ {"Address", "address", TAB_ADDRESS},/* ADDRESS */ + {"Address2", "address2", TAB_ADDRESS},/* ADDRESS2 */ {"City", "city", TAB_ADDRESS},/* CITY */ {"State/Province","state", TAB_ADDRESS},/* STATE */ {"ZIP/Postal Code","zip", TAB_ADDRESS},/* ZIP */ @@ -69,9 +72,26 @@ struct abook_field abook_fields[ITEM_FIELDS] = { {"Nickname/Alias", "nick", TAB_OTHER},/* NICK */ {"URL", "url", TAB_OTHER},/* URL */ {"Notes", "notes", TAB_OTHER},/* NOTES */ + {"Custom1", "custom1", TAB_CUSTOM},/* CUSTOM1 */ + {"Custom2", "custom2", TAB_CUSTOM},/* CUSTOM2 */ + {"Custom3", "custom3", TAB_CUSTOM},/* CUSTOM3 */ + {"Custom4", "custom4", TAB_CUSTOM},/* CUSTOM4 */ + {"Custom5", "custom5", TAB_CUSTOM},/* CUSTOM5 */ }; +int +find_field(const char *field) +{ + int i; + + for(i = 0; i < ITEM_FIELDS; i++) + if( !strcmp(abook_fields[i].key, field) ) + return i; + + return -1; +} + int parse_database(FILE *in) { @@ -107,9 +127,12 @@ parse_database(FILE *in) } else if((tmp = strchr(line, '=') ) && sec ) { *tmp++ = '\0'; for(i=0; i _MAX_FIELD_LEN(i) ) ) { + if( item[i] && ((int)strlen(item[i]) > _MAX_FIELD_LEN(i) ) ) { tmp = item[i]; item[i][_MAX_FIELD_LEN(i)-1] = 0; item[i] = strdup(item[i]); @@ -251,9 +279,8 @@ adjust_list_capacity() else return; - database = abook_realloc(database, - sizeof(list_item) * list_capacity); - selected = abook_realloc(selected, list_capacity); + database = xrealloc(database, sizeof(list_item) * list_capacity); + selected = xrealloc(selected, list_capacity); } int @@ -280,7 +307,7 @@ remove_selected_items() { int i, j; - if( items < 1 || curitem < 0 ) + if( list_is_empty() ) return; if( ! selected_items() ) @@ -309,21 +336,14 @@ remove_selected_items() char * get_surname(char *s) { - int i, a; - int len = strlen(s); - char *name = strdup(s); - - for( a = 0, i = len - 1; i >= 0; i--, a++ ) { - name[a] = s[i]; - if(name[a] == ' ') - break; - } + char *p = s + strlen(s); - name[ a ] = 0; + assert(s != NULL); - revstr(name); + while(p > s && *(p - 1) != ' ') + p--; - return name; + return strdup(p); } static int @@ -339,8 +359,8 @@ surnamecmp(const void *i1, const void *i2) s1 = get_surname(a[NAME]); s2 = get_surname(b[NAME]); - if( !(ret = safe_strcmp(s1, s2)) ) - ret = safe_strcmp(a[NAME], b[NAME]); + if( !(ret = safe_strcoll(s1, s2)) ) + ret = safe_strcoll(a[NAME], b[NAME]); free(s1); free(s2); @@ -348,21 +368,53 @@ surnamecmp(const void *i1, const void *i2) return ret; } +static int sort_field = -1; + static int namecmp(const void *i1, const void *i2) { list_item a, b; + assert(sort_field >= 0 && sort_field <= LAST_FIELD); + itemcpy(a, i1); itemcpy(b, i2); - return safe_strcmp( a[NAME], b[NAME] ); + return safe_strcoll( a[sort_field], b[sort_field] ); +} + +static int +name2field(char *name) +{ + int i, ret = -1; + + for(i = 0; i < ITEM_FIELDS; i++) { + if(!strcasecmp(name, abook_fields[i].key)) { + ret = i; + break; + } + } + + return ret; } void -sort_database() +sort_by_field(int field) { select_none(); + + assert(field <= LAST_FIELD); + + if(field < 0) { + field = name2field(opt_get_str(STR_SORT_FIELD)); + if(field < 0) { + statusline_msg("Not valid field value defined " + "in configuration"); + return; + } + } + + sort_field = field; qsort((void *)database, items, sizeof(list_item), namecmp); @@ -380,26 +432,30 @@ sort_surname() } int -find_item(char *str, int start) +find_item(char *str, int start, int search_fields[]) { int i; char *findstr = NULL; char *tmp = NULL; int ret = -1; /* not found */ + struct db_enumerator e = init_db_enumerator(ENUM_ALL); - if(items < 1 || start < 0 || start >= LAST_ITEM) + if(list_is_empty() || !is_valid_item(start)) return -2; /* error */ findstr = strdup(str); - findstr = strupper(findstr); - - for( i = start; i < items; i++ ) { - tmp = strdup(database[i][NAME]); - if( strstr(strupper(tmp), findstr) != NULL ) { - ret = i; - goto out; + findstr = strlower(findstr); + + e.item = start - 1; /* must be "real start" - 1 */ + db_enumerate_items(e) { + for( i = 0; search_fields[i] >= 0; i++ ) { + tmp = safe_strdup(database[e.item][search_fields[i]]); + if( tmp && strstr(strlower(tmp), findstr) ) { + ret = e.item; + goto out; + } + xfree(tmp); } - my_free(tmp); } out: @@ -414,3 +470,95 @@ is_selected(int item) { return selected[item]; } + +int +is_valid_item(int item) +{ + return item <= LAST_ITEM && item >= 0; +} + +int +real_db_enumerate_items(struct db_enumerator e) +{ + int item = max(0, e.item + 1); + int i; + + switch(e.mode) { +#ifdef DEBUG + case ENUM_ALL: + break; +#endif + case ENUM_SELECTED: + for(i = item; i < items; i++) { + if(is_selected(i)) { + item = i; + goto out; + } + } + return -1; +#ifdef DEBUG + default: + fprintf(stderr, "real_db_enumerate_items() " + "BUG: unknown db_enumerator mode: %d\n", + e.mode); + break; +#endif + } +out: + return (item > LAST_ITEM || item < 0) ? -1 : item; +} + +struct db_enumerator +init_db_enumerator(int mode) +{ + struct db_enumerator e; + + e.item = -1; /* important - means "start from beginning" */ + e.mode = mode; + + return e; +} + +static int +assign_fieldname(const char *name, int i) +{ + char *s; + + assert(name); + assert(i >= 0 && i < ITEM_FIELDS); + + if(strcasecmp(abook_fields[i].name, name)) { /* name differs */ + /* + * check if we are overwriting statically allocated default + */ + if(strcasecmp(abook_fields[i].name, abook_fields[i].key)) + xfree(abook_fields[i].name); + + s = xmalloc_inc(MAX_FIELDNAME_LEN, 1); + snprintf(s, MAX_FIELDNAME_LEN, "%s", name); + abook_fields[i].name = s; + } + + return 0; +} + +int +change_custom_field_name(const char *name, int n) +{ + int i; + char keyname[21]; + + assert(name); + + snprintf(keyname, sizeof(keyname), "custom%d", n); + + for(i = CUSTOM_MIN; i <= CUSTOM_MAX; i++) { + if(!strcasecmp(abook_fields[i].key, keyname)) { + assign_fieldname(name, i); + return i; + } + } + + return -1; +} +