X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=abook.c;h=af0d9d03e20d16f9da94e152722184e360822d28;hb=2a26341bf061714afb85b756397c0be5b77bb4c6;hp=c80ea53f034609cea3d33bed60e9cdcd84dad831;hpb=3990095c4ac65c7f6e10b2fa074f763d048a92eb;p=pkg%2Fabook.git

diff --git a/abook.c b/abook.c
index c80ea53..af0d9d0 100644
--- a/abook.c
+++ b/abook.c
@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * by JH <jheinonen@bigfoot.com>
+ * by JH <jheinonen@users.sourceforge.net>
  *
  * Copyright (C) Jaakko Heinonen
  */
@@ -204,10 +204,9 @@ show_usage()
 }
 
 extern list_item *database;
-extern int items;
 
 static void
-muttq_print_item(int item)
+muttq_print_item(FILE *file, int item)
 {
 	char emails[MAX_EMAILS][MAX_EMAIL_LEN];
 	int i;
@@ -217,80 +216,35 @@ muttq_print_item(int item)
 	for(i = 0; i < (options_get_int("mutt_return_all_emails") ?
 			MAX_EMAILS : 1) ; i++)
 		if( *emails[i] )
-			printf("%s\t%s\t%s\n", emails[i],
+			fprintf(file, "%s\t%s\t%s\n", emails[i],
 				database[item][NAME],
 				database[item][NOTES] == NULL ? " " :
 					database[item][NOTES]
 				);
 }
 
-static int
-mutt_query_name(char *str)
-{
-	int i, j;
-	char *tmp;
-
-	for(i = 0, j = 0 ; i < items; i++) {
-		tmp = strdup(database[i][NAME]);
-		if( strstr( strupper(tmp), strupper(str) ) != NULL ) {
-			if( !j )
-				putchar('\n');
-			muttq_print_item(i);
-			j++;
-		}
-		free(tmp);
-	}
-
-	return j;
-}
-
-static int
-mutt_query_email(char *str)
-{
-	int i, j, k;
-	char *tmp, emails[MAX_EMAILS][MAX_EMAIL_LEN];
-
-	for(i = 0, j = 0; i < items; i++) {
-		split_emailstr(i, emails);
-		for(k = 0; k < MAX_EMAILS; k++) {
-			if( *emails[k] ) {
-				tmp = strdup( emails[k] );
-				if( strstr( strupper(tmp), strupper(str) ) != NULL ) {
-					if( !j )
-						putchar('\n');
-					j++;
-					if( options_get_int("mutt_return_all_emails") ) {
-						muttq_print_item(i);
-						free(tmp);
-						break;
-					} else
-						printf("%s\t%s\n", emails[k],
-							database[i][NAME]);
-				}
-				free(tmp);
-			}
-		}
-	}
-
-	return j;
-}
-
 static void
 mutt_query(char *str)
 {
-	int i;
-	
 	init_mutt_query();
 
 	if( str == NULL || !strcasecmp(str, "all") ) {
+		struct db_enumerator e = init_db_enumerator(ENUM_ALL);
 		printf("All items\n");
-		for(i = 0; i < items; i++)
-			muttq_print_item(i);
+		db_enumerate_items(e)
+			muttq_print_item(stdout, e.item);
 	} else {
-		if( !mutt_query_name(str) && !mutt_query_email(str) ) {
+		int search_fields[] = {NAME, EMAIL, NICK, -1};
+		int i;
+		if( (i = find_item(str, 0, search_fields)) < 0 ) {
 			printf("Not found\n");
 			quit_mutt_query(1);
 		}
+		putchar('\n');
+		while(i >= 0) {
+			muttq_print_item(stdout, i);
+			i = find_item(str, i+1, search_fields);
+		}
 	}
 
 	quit_mutt_query(0);
@@ -319,43 +273,76 @@ quit_mutt_query(int status)
 }
 
 
+static char *
+make_mailstr(int item)
+{
+	char email[MAX_EMAIL_LEN];
+	char *ret;
+	char *name = mkstr("\"%s\"", database[item][NAME]);
+
+	get_first_email(email, item);
+
+	ret = *database[item][EMAIL] ?
+		mkstr("%s <%s>", name, email) :
+		strdup(name);
+
+	free(name);
+	
+	return ret;
+}
+
+void
+print_stderr(int item)
+{
+    fprintf (stderr, "%c", '\n');
+
+	if( is_valid_item(item) )
+		muttq_print_item(stderr, item);
+	else {
+		struct db_enumerator e = init_db_enumerator(ENUM_SELECTED);
+		db_enumerate_items(e) {
+			muttq_print_item(stderr, e.item);
+		}
+	}
+
+}
+
 void
 launch_mutt(int item)
 {
-	int i;
-	char email[MAX_EMAIL_LEN];
-	char *cmd;
-	char *tmp = options_get_str("mutt_command");
+	char *cmd = NULL, *mailstr = NULL;
+	char *mutt_command = options_get_str("mutt_command");
 
-	if( !is_valid_item(item) )
+	if(mutt_command == NULL || !*mutt_command)
 		return;
 
-	cmd = strconcat(tmp, " '", NULL );
-
-	for(i=0; i < items; i++) {
-		if( ! is_selected(i) && i != list_current_item() )
-			continue;
-		get_first_email(email, i);
-		tmp = mkstr("%s \"%s\"", cmd, database[i][NAME]);
-		my_free(cmd);
-		if( *database[i][EMAIL] ) {
-			cmd = mkstr("%s <%s>", tmp, email);
+	if( is_valid_item(item) )
+		mailstr = make_mailstr(item);
+	else {
+		struct db_enumerator e = init_db_enumerator(ENUM_SELECTED);
+		char *tmp = NULL;
+		db_enumerate_items(e) {
+			tmp = mailstr;
+			mailstr = tmp ?
+				strconcat(tmp, ",", make_mailstr(e.item), NULL):
+				strconcat(make_mailstr(e.item), NULL);
 			free(tmp);
-			tmp = cmd;
 		}
-		cmd = strconcat(tmp, " ", NULL);
-		free(tmp);
 	}
 
-	tmp = mkstr("%s%c", cmd, '\'');
-	free(cmd);
-	cmd = tmp;
+	cmd = strconcat(mutt_command, " \'", mailstr,
+				"\'", NULL);
+	free(mailstr);
 #ifdef DEBUG
 	fprintf(stderr, "cmd: %s\n", cmd);
 #endif
 	system(cmd);	
-
 	free(cmd);
+	
+	/*
+	 * we need to make sure that curses settings are correct
+	 */
+	ui_init_curses();
 }
 
 void
@@ -377,6 +364,11 @@ launch_wwwbrowser(int item)
 		system(cmd);
 
 	free(cmd);
+
+	/*
+	 * we need to make sure that curses settings are correct
+	 */
+	ui_init_curses();
 }
 
 void *
@@ -441,11 +433,13 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
 	strlower(srcformat);
 	strlower(dstformat);
 
+#ifndef DEBUG
 	if( !strcmp(srcformat, dstformat) ) {
 		printf(	"input and output formats are the same\n"
 			"exiting...\n");
 		exit(1);
 	}
+#endif
 
 	set_filenames();
 	init_options();
@@ -477,4 +471,3 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
 	exit(ret);
 }
 
-