X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=abook.c;h=e9f8841dccee9c3eb23be9a2e882e3be2fdcb99f;hb=141acfcc;hp=866d71db4f38f9367c6ecc56cd115c4ea9654775;hpb=5b294375faaa96e4c8e724de274e8badccf3395c;p=pkg%2Fabook.git

diff --git a/abook.c b/abook.c
index 866d71d..e9f8841 100644
--- a/abook.c
+++ b/abook.c
@@ -50,6 +50,8 @@ static void		add_email(int);
 char *datafile = NULL;
 static char *rcfile = NULL;
 
+struct abook_output_item_filter selected_item_filter;
+
 bool alternative_datafile = FALSE;
 bool alternative_rcfile = FALSE;
 
@@ -303,6 +305,7 @@ parse_command_line(int argc, char **argv)
 		*infile = "-",
 		*outfile = "-";
 	int c;
+	selected_item_filter = select_output_item_filter("muttq");
 
 	for(;;) {
 		int option_index = 0;
@@ -368,7 +371,8 @@ parse_command_line(int argc, char **argv)
 				set_convert_var(informat);
 				break;
 			case OPT_OUTFORMAT:
-				set_convert_var(outformat);
+				outformat = optarg;
+				selected_item_filter = select_output_item_filter(outformat);
 				break;
 			case OPT_INFILE:
 				set_convert_var(infile);
@@ -384,6 +388,8 @@ parse_command_line(int argc, char **argv)
 		}
 	}
 
+	if(! selected_item_filter.func)
+		selected_item_filter = select_output_item_filter("muttq");
 	if(optind < argc) {
 		fprintf(stderr, _("%s: unrecognized arguments on command line\n"),
 				argv[0]);
@@ -452,10 +458,7 @@ mutt_query(char *str)
 	init_mutt_query();
 
 	if( str == NULL || !strcasecmp(str, "all") ) {
-		struct db_enumerator e = init_db_enumerator(ENUM_ALL);
-		printf("All items\n");
-		db_enumerate_items(e)
-			muttq_print_item(stdout, e.item);
+		export_file("muttq", "-");
 	} else {
 		int search_fields[] = {NAME, EMAIL, NICK, -1};
 		int i;
@@ -465,7 +468,7 @@ mutt_query(char *str)
 		}
 		putchar('\n');
 		while(i >= 0) {
-			muttq_print_item(stdout, i);
+			e_write_item(stdout, i, selected_item_filter.func);
 			i = find_item(str, i + 1, search_fields);
 		}
 	}