Fixed surname sort.

[pkg/abook.git] / database.c

diff --git a/database.c b/database.c
index bd8877164e61675b85f3d3b4ca3749797d212ed6..a9e77b55ad15f9d344d9bdae93e052896b50b88e 100644 (file)
--- a/database.c
+++ b/database.c
@@ -26,9 +26,10 @@ abook_field_list *fields_list = NULL;
 int fields_count = 0;
 
 list_item *database = NULL;
-int items = 0;
+static int items = 0;
 
 #define ITEM_SIZE (fields_count * sizeof(char *))
+#define LAST_ITEM (items - 1)
 
 #define INITIAL_LIST_CAPACITY  30
 static int list_capacity = 0;
@@ -202,9 +203,11 @@ declare_unknown_field(char *key)
        if(!database)
                return;
 
-       for(i = 0; i < fields_count; i++)
-               if(database[i])
+       for(i = 0; i < items; i++)
+               if(database[i]) {
                        database[i] = xrealloc(database[i], ITEM_SIZE);
+                       database[i][fields_count - 1] = NULL;
+               }
 }
 
 /*
@@ -540,9 +543,6 @@ surnamecmp(const void *i1, const void *i2)
        int ret, idx = field_id(NAME);
        char *n1, *n2, *s1, *s2;
 
-       if(idx == 0)
-               return 0; /* no 'name' field */
-
        n1 = (*(list_item *)i1)[idx];
        n2 = (*(list_item *)i2)[idx];
        
@@ -660,6 +660,17 @@ is_valid_item(int item)
        return item <= LAST_ITEM && item >= 0;
 }
 
+int
+last_item()
+{
+       return LAST_ITEM;
+}
+
+int
+db_n_items()
+{
+       return items;
+}
 
 int
 real_db_enumerate_items(struct db_enumerator e)
@@ -823,3 +834,22 @@ db_item_get(int i)
        return database[i];
 }
 
+/* Fetch addresses from all fields of FIELD_EMAILS type */
+/* Memory has to be freed by the caller */
+char *
+db_email_get(int item)
+{
+       int i;
+       char *res;
+       abook_field_list *cur;
+       abook_list *emails = NULL;
+
+       for(cur = fields_list, i = 0; cur; cur = cur->next, i++)
+               if(cur->field->type == FIELD_EMAILS && *database[item][i])
+                       abook_list_append(&emails, database[item][i]);
+
+       res = abook_list_to_csv(emails);
+       abook_list_free(&emails);
+       return res ? res : xstrdup("");
+}
+