X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=database.c;h=c17adae62b7da64a6d4e19d83040b05729b83ae2;hb=cdf37400fa5a7a7ccdc0a5aed63db7f012a5d7b5;hp=1577966471f4e7e2ab2636562c8cd81ad3f603ce;hpb=ea5b79b21b3e6b5d009dca4afcab7f3ed9cabdd5;p=pkg%2Fabook.git

diff --git a/database.c b/database.c
index 1577966..c17adae 100644
--- a/database.c
+++ b/database.c
@@ -2,7 +2,7 @@
 /*
  * $Id$
  *
- * by JH <jheinonen@bigfoot.com>
+ * by JH <jheinonen@users.sourceforge.net>
  *
  * Copyright (C) Jaakko Heinonen
  */
@@ -13,6 +13,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include "abook.h"
+#include <assert.h>
 #include "database.h"
 #include "list.h"
 #include "misc.h"
@@ -58,6 +59,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 */
@@ -107,9 +109,12 @@ parse_database(FILE *in)
 		} else if((tmp = strchr(line, '=') ) && sec ) {
 			*tmp++ = '\0';
 			for(i=0; i<ITEM_FIELDS; i++)
-				if( !strcmp(abook_fields[i].key, line) )
+				if( !strcmp(abook_fields[i].key, line) ) {
 					item[i] = strdup(tmp);
+					goto next;
+				}
 		}
+next:
 		free(line);
 	}
 
@@ -132,10 +137,7 @@ load_database(char *filename)
 	
 	parse_database(in);
 
-	if ( items == 0 )
-		return 2;
-
-	return 0;
+	return (items == 0) ? 2 : 0;
 }
 
 int
@@ -144,15 +146,17 @@ write_database(FILE *out, struct db_enumerator e)
 	int j;
 	int i = 0;
 
-	fprintf(out, "# abook addressbook file\n\n");
-	fprintf(out, "[format]\n");
-	fprintf(out, "program=" PACKAGE "\n");
-	fprintf(out, "version=" VERSION "\n");
-	fprintf(out, "\n\n");
+	fprintf(out,
+		"# abook addressbook file\n\n"
+		"[format]\n"
+		"program=" PACKAGE "\n"
+		"version=" VERSION "\n"
+		"\n\n"
+	);
 
 	db_enumerate_items(e) {
 		fprintf(out, "[%d]\n", i);
-		for(j=0; j<ITEM_FIELDS; j++) {
+		for(j = 0; j < ITEM_FIELDS; j++) {
 			if( database[e.item][j] != NULL &&
 					*database[e.item][j] )
 				fprintf(out, "%s=%s\n",
@@ -226,7 +230,7 @@ close_database()
 
 #define _MAX_FIELD_LEN(X)	(X == EMAIL ? MAX_EMAILSTR_LEN:MAX_FIELD_LEN)
 
-inline static void
+static void
 validate_item(list_item item)
 {
 	int i;
@@ -236,7 +240,7 @@ validate_item(list_item item)
 		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]);
@@ -257,9 +261,9 @@ adjust_list_capacity()
 	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
@@ -315,21 +319,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
@@ -345,8 +342,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);
@@ -354,21 +351,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);
 
@@ -398,13 +427,13 @@ find_item(char *str, int start, int search_fields[])
 		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;
 			}
@@ -465,10 +494,10 @@ 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;
 }