query/find code cleanup

[pkg/abook.git] / database.h

diff --git a/database.h b/database.h
index 0c47fd49bda38a7e37df61504f0493024e972ba3..7d947aa529203301ee82a710e33b4bac0e382cec 100644 (file)
--- a/database.h
+++ b/database.h
@@ -36,8 +36,18 @@ struct abook_field {
        int tab;
 };
 
+enum {
+       ENUM_ALL,
+       ENUM_SELECTED
+};
+
+struct db_enumerator {
+       int item;
+       int mode; /* warning: read only */
+};
+
 int            parse_database(FILE *in);
-int            write_database(FILE *out);
+int            write_database(FILE *out, struct db_enumerator e);
 int            load_database(char *filename);
 int            save_database();
 void           close_database();
@@ -47,9 +57,12 @@ void         remove_selected_items();
 void           sort_surname();
 void           sort_database();
 char           *get_surname(char *s);
-int            find_item(char *str, int start);
+int            find_item(char *str, int start, int search_fields[]);
 int            is_selected(int item);
+int            is_valid_item(int item);
 
+int            real_db_enumerate_items(struct db_enumerator e);
+struct db_enumerator   init_db_enumerator(int mode);
 
 #define LAST_ITEM      (items - 1)
 
@@ -72,4 +85,7 @@ int           is_selected(int item);
 #define have_multiple_emails(item) \
        strchr(database[item][EMAIL], ',')
 
+#define db_enumerate_items(e) \
+       while( -1 != (e.item = real_db_enumerate_items(e)))
+
 #endif