X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=database.c;h=a2c396dedb3a676033f85f870b842fc3dbf67112;hb=3212da92838c056bcc1cafa57beaf26086e2ac96;hp=03e20ed38857b129e9d07613ab50746a92c254fa;hpb=0d3c17d9ab127e5596c8fb97d65122b3b90f6b11;p=pkg%2Fabook.git

diff --git a/database.c b/database.c
index 03e20ed..a2c396d 100644
--- a/database.c
+++ b/database.c
@@ -1,6 +1,7 @@
 
 /*
- * database.c
+ * $Id$
+ *
  * by JH <jheinonen@bigfoot.com>
  *
  * Copyright (C) Jaakko Heinonen
@@ -11,7 +12,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include "abook_curses.h"
 #include "abook.h"
 #include "database.h"
 #include "list.h"
@@ -152,10 +152,9 @@ write_database(FILE *out)
 	for( i = 0; i < items; i++ ) {
 		fprintf(out, "[%d]\n", i);
 		for(j=0; j<ITEM_FIELDS; j++) {
-			if( database[i][j] != NULL )
-				if( *database[i][j] )
-					fprintf(out, "%s=%s\n",
-						abook_fields[j].key, database[i][j]);
+			if( database[i][j] != NULL && *database[i][j] )
+				fprintf(out, "%s=%s\n",
+					abook_fields[j].key, database[i][j]);
 		}
 		fputc('\n', out);
 	}
@@ -277,23 +276,13 @@ add_item2database(list_item item)
 }
 
 void
-remove_items()
+remove_selected_items()
 {
 	int i, j;
 
 	if( items < 1 || curitem < 0 )
 		return;
 
-	statusline_addstr("Remove selected item(s) (Y/n)");
-	switch( getch() ) {
-		case '\r':
-		case 'y':
-		case 'Y': break;
-		default:
-			  clear_statusline();
-			  return;
-	}
-
 	if( ! selected_items() )
 		selected[ curitem ] = 1;
 	
@@ -315,8 +304,6 @@ remove_items()
 	adjust_list_capacity();
 
 	select_none();
-	clear_statusline();	
-	refresh_list();
 }
 
 char *
@@ -392,111 +379,38 @@ sort_surname()
 	refresh_screen();
 }
 
-void
-clear_database()
-{
-
-	statusline_addstr("Clear WHOLE database (y/N)");
-	switch( getch() ) {
-		case 'y':
-		case 'Y': break;
-		default:
-			clear_statusline();
-			return;
-	}
-
-	close_database();
-
-	refresh_screen();
-}
-
-void
-find(int next)
+int
+find_item(char *str, int start)
 {
 	int i;
-	static char findstr[81];
-	char tmp[81];
+	char *findstr = NULL;
+	char *tmp = NULL;
+	int ret = -1; /* not found */
 
-#ifdef DEBUG
-	fprintf(stderr, "find(): findstr = |%s|\n", findstr);
-#endif
-	
-	if(next) {
-		if( !*findstr )
-			return;
-	} else {
-		clear_statusline();
-		statusline_addstr("/");
-		statusline_getnstr(findstr, 67, 0);
-		strupper(findstr);
-		clear_statusline();
-	}
+	if(items < 1 || start < 0 || start >= LAST_ITEM)
+		return -2; /* error */
 
-	if(items < 1)
-		return;
+	findstr = strdup(str);
+	findstr = strupper(findstr);
 
-	for( i = (curitem < LAST_ITEM) && next ? curitem+1 : curitem;
-			i < items; i++ ) {
-		strcpy(tmp, database[i][NAME]);
+	for( i = start; i < items; i++ ) {
+		tmp = strdup(database[i][NAME]);
 		if( strstr(strupper(tmp), findstr) != NULL ) {
-			curitem = i;
-			refresh_list();
-			break;
+			ret = i;
+			goto out;
 		}
+		my_free(tmp);
 	}
-}
 
-
-void
-print_number_of_items()
-{
-	char *str =
-		mkstr("     |%3d/%3d", selected_items(), items);
-
-	mvaddstr(0, COLS-strlen(str), str);
-
-	free(str);
-}
-
-void
-read_database()
-{
-	if(items > 0) {
-		statusline_addstr("Your current data will be lost - Press 'y' to continue");
-		switch( getch() ) {
-			case 'y':
-			case 'Y': break;
-			default: clear_statusline();
-				 return;
-		}
-		clear_statusline();
-	}
-
-	load_database(datafile);
-	refresh_list();
+out:
+	free(findstr);
+	free(tmp);
+	return ret;
 }
 
 
-void
-print_database()
+int
+is_selected(int item)
 {
-	FILE *handle;
-	char *command = options_get_str("print_command");
-
-	statusline_addstr("Print addressbook? (y/N)");
-	switch( getch() ) {
-		case 'y':
-		case 'Y':
-			break;
-		default: clear_statusline(); return;
-	}
-	clear_statusline();
-
-	if( ! *command || (handle = popen(command, "w")) == NULL)
-		return;
-
-	fexport("text", handle);
-	
-	pclose(handle);
+	return selected[item];
 }
-