X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=database.c;h=da6890f11aba80f44583370aaec7d94d37f8f027;hb=9c91aba7c7f7e47ec1a90b58d7f238c6b043dac1;hp=2b642f8aad59b5136b5e6582d19ff92e6ccaf721;hpb=216cf3ed9e60bea94d777029eb3b5e44c65f1b68;p=pkg%2Fabook.git

diff --git a/database.c b/database.c
index 2b642f8..da6890f 100644
--- a/database.c
+++ b/database.c
@@ -57,7 +57,7 @@ abook_field standard_fields[] = {
 	{"nick",	N_("Nickname/Alias"),	FIELD_STRING}, /* NICK */
 	{"url",		N_("URL"),		FIELD_STRING}, /* URL */
 	{"notes",	N_("Notes"),		FIELD_STRING}, /* NOTES */
-	{"anniversary",	N_("Anniversary day"),	FIELD_DAY},    /* ANNIVERSARY */
+	{"anniversary",	N_("Anniversary day"),	FIELD_DATE},   /* ANNIVERSARY */
 	{0} /* ITEM_FIELDS */
 };
 
@@ -121,7 +121,7 @@ real_find_field(char *key, abook_field_list *list, int *number)
 }
 
 void
-get_field_keyname(int i, char **key, char **name)
+get_field_info(int i, char **key, char **name, int *type)
 {
 	abook_field_list *cur = fields_list;
 	int j;
@@ -135,6 +135,8 @@ get_field_keyname(int i, char **key, char **name)
 		*key = (i < 0) ? NULL : cur->field->key;
 	if(name)
 		*name = (i < 0) ? NULL : cur->field->name;
+	if(type)
+		*type = (i < 0) ? -1 : cur->field->type;
 }
 
 void
@@ -177,8 +179,8 @@ declare_new_field(char *key, char *name, char *type, int accept_standard)
 		f->type = FIELD_EMAILS;
 	else if(0 == strcasecmp("list", type))
 		f->type = FIELD_LIST;
-	else if(0 == strcasecmp("day", type))
-		f->type = FIELD_DAY;
+	else if(0 == strcasecmp("date", type))
+		f->type = FIELD_DATE;
 	else
 		return _("unknown type");
 
@@ -358,18 +360,13 @@ save_database()
 		goto out;
 	}
 
-	if(list_is_empty()) {
-		fclose(out);
-		unlink(datafile);
-		ret = 1;
-		goto out;
-	}
+	if(!list_is_empty())
+		/*
+		 * Possibly should check if write_database failed.
+		 * Currently it returns always zero.
+		 */
+		write_database(out, e);
 
-	/*
-	 * Possibly should check if write_database failed.
-	 * Currently it returns always zero.
-	 */
-	write_database(out, e);
 	fclose(out);
 
 	if(access(datafile, F_OK) == 0 &&
@@ -433,7 +430,7 @@ validate_item(list_item item)
 			case FIELD_STRING:
 				max_field_len = MAX_FIELD_LEN;
 				break;
-			case FIELD_DAY:
+			case FIELD_DATE:
 				break;
 			default:
 				assert(0);
@@ -543,9 +540,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];