X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=database.h;h=43b733817a06827d8ba848c91b25d4fc4c26d4cc;hb=e270270d27cee6dd262e51a9701bff0217c26bc6;hp=7d947aa529203301ee82a710e33b4bac0e382cec;hpb=ea5b79b21b3e6b5d009dca4afcab7f3ed9cabdd5;p=pkg%2Fabook.git

diff --git a/database.h b/database.h
index 7d947aa..43b7338 100644
--- a/database.h
+++ b/database.h
@@ -11,6 +11,7 @@ enum {
 	NAME,
 	EMAIL,
 	ADDRESS,
+        ADDRESS2,
 	CITY,
 	STATE,
 	ZIP,
@@ -21,12 +22,11 @@ enum {
 	MOBILEPHONE,
 	NICK,
 	URL,
-	NOTES
+	NOTES,
+	ITEM_FIELDS /* this is the last */
 };
 
-#define LAST_FIELD		NOTES
-
-#define ITEM_FIELDS		(LAST_FIELD+1)
+#define LAST_FIELD		(ITEM_FIELDS - 1)
 
 typedef char * list_item[ITEM_FIELDS];
 
@@ -55,7 +55,7 @@ int		add_item2database(list_item item);
 void		free_list_item(list_item item);
 void		remove_selected_items();
 void		sort_surname();
-void		sort_database();
+void		sort_by_field(int field);
 char		*get_surname(char *s);
 int		find_item(char *str, int start, int search_fields[]);
 int		is_selected(int item);
@@ -72,7 +72,7 @@ struct db_enumerator	init_db_enumerator(int mode);
 	int _i,_j,_k,len; \
 	memset(&emails, 0, sizeof(emails) ); \
 	len = strlen(database[item][EMAIL]); \
-	for( _i=0,_j=0, _k=0; _i < len && _j < 4; _i++ ) { \
+	for( _i=0,_j=0, _k=0; _i < len && _j < MAX_EMAILS; _i++ ) { \
 		if( database[item][EMAIL][_i] ==',' ) { \
 			_j++; \
 			_k = 0; \