Fixed 'undo' command corrupting the database when used after changing of

[pkg/abook.git] / database.h

diff --git a/database.h b/database.h
index 7d947aa529203301ee82a710e33b4bac0e382cec..87228851df824051ad20fe6ea8bc1e37f67e2324 100644 (file)
--- a/database.h
+++ b/database.h
@@ -11,6 +11,7 @@ enum {
        NAME,
        EMAIL,
        ADDRESS,
+        ADDRESS2,
        CITY,
        STATE,
        ZIP,
@@ -21,14 +22,23 @@ enum {
        MOBILEPHONE,
        NICK,
        URL,
-       NOTES
+       NOTES,
+       CUSTOM1,
+       CUSTOM2,
+       CUSTOM3,
+       CUSTOM4,
+       CUSTOM5,
+       ITEM_FIELDS /* this is the last */
 };
 
-#define LAST_FIELD             NOTES
+#define LAST_FIELD             (ITEM_FIELDS - 1)
 
-#define ITEM_FIELDS            (LAST_FIELD+1)
+#define CUSTOM_MIN             CUSTOM1
+#define CUSTOM_MAX             CUSTOM5
 
-typedef char * list_item[ITEM_FIELDS];
+typedef char *list_item[ITEM_FIELDS];
+
+#define        MAX_FIELDNAME_LEN       21
 
 struct abook_field {
        char *name;
@@ -46,6 +56,7 @@ struct db_enumerator {
        int mode; /* warning: read only */
 };
 
+int            find_field(const char *field);
 int            parse_database(FILE *in);
 int            write_database(FILE *out, struct db_enumerator e);
 int            load_database(char *filename);
@@ -55,7 +66,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);
@@ -63,6 +74,7 @@ int           is_valid_item(int item);
 
 int            real_db_enumerate_items(struct db_enumerator e);
 struct db_enumerator   init_db_enumerator(int mode);
+int            change_custom_field_name(const char *name, int n);
 
 #define LAST_ITEM      (items - 1)
 
@@ -72,7 +84,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; \