#include <unistd.h>
#include <fcntl.h>
#include "abook.h"
+#include <assert.h>
#include "database.h"
#include "list.h"
#include "misc.h"
{"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 */
parse_database(in);
- if ( items == 0 )
- return 2;
-
- return 0;
+ return (items == 0) ? 2 : 0;
}
int
item[EMAIL] = strdup("");
for(i=0; i<ITEM_FIELDS; i++)
- if( item[i] && (strlen(item[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]);
else
return;
- database = abook_realloc(database,
+ database = (list_item *)abook_realloc(database,
sizeof(list_item) * list_capacity);
- selected = abook_realloc(selected, list_capacity);
+ selected = (char *)abook_realloc(selected, list_capacity);
}
int
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
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);
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);
return -2; /* error */
findstr = strdup(str);
- findstr = strupper(findstr);
+ 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(strupper(tmp), findstr) ) {
+ if( tmp && strstr(strlower(tmp), findstr) ) {
ret = e.item;
goto out;
}
struct db_enumerator
init_db_enumerator(int mode)
{
- struct db_enumerator new;
+ struct db_enumerator e;
- new.item = -1; /* important - means "start from beginning" */
- new.mode = mode;
+ e.item = -1; /* important - means "start from beginning" */
+ e.mode = mode;
- return new;
+ return e;
}