X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=interactive.c;h=93e4a36b46e66a6481cc70afb91e562b0a26b5ff;hb=fd37e9fafb8fd103b530ab45f0624fb5d67c0a89;hp=376ab48b627f499c29cd896b318feb2fad38a1ee;hpb=015abc3b736ce8cb784b9e60d8c4cf2427874d2d;p=adu.git

diff --git a/interactive.c b/interactive.c
index 376ab48..93e4a36 100644
--- a/interactive.c
+++ b/interactive.c
@@ -1,8 +1,9 @@
 #include "adu.h"
+#include "format.h"
+#include "select.h"
 #include "string.h"
 #include "error.h"
 #include "cmdline.h"
-#include "select.cmdline.h"
 
 struct interactive_command {
 	const char *name;
@@ -10,11 +11,15 @@ struct interactive_command {
 	const char *desc;
 };
 
+static struct uid_range *admissible_uids;
+static struct format_info *fi;
+
 #define INTERACTIVE_COMMANDS \
 	INTERACTIVE_COMMAND(dump, "dump the current configuration") \
 	INTERACTIVE_COMMAND(set, "change the current configuration") \
 	INTERACTIVE_COMMAND(reset, "reset configuration to defaults") \
 	INTERACTIVE_COMMAND(help, "show list of commands and one-line descriptions") \
+	INTERACTIVE_COMMAND(run, "start the query according to the current options")
 
 
 #define INTERACTIVE_COMMAND(name, desc) \
@@ -43,6 +48,11 @@ static int read_input_line(char *line, size_t size)
 	return fgets(line, size, stdin)? 1 : -1;
 }
 
+static int icom_run(__a_unused char *line)
+{
+	return run_select_query(admissible_uids, fi);
+}
+
 static int icom_help(__a_unused char *line)
 {
 	struct interactive_command *c;
@@ -52,14 +62,17 @@ static int icom_help(__a_unused char *line)
 	return 1;
 }
 
+void print_interactive_help(void)
+{
+	icom_help(NULL);
+}
+
 static int icom_reset(__a_unused char *line)
 {
 	select_cmdline_parser_init(&select_conf);
 	return 1;
 }
 
-static struct uid_range *admissible_uids;
-
 static int icom_set(char *line)
 {
 	struct select_cmdline_parser_params params = {
@@ -69,15 +82,11 @@ static int icom_set(char *line)
 		.check_ambiguity = 0,
 		.print_errors = 1
 	};
-	if (select_cmdline_parser_string_ext(line, &select_conf, "select",
-		&params))
-		return -E_SYNTAX;
-	return parse_uid_arg(select_conf.uid_arg, &admissible_uids);
+	return parse_select_options(line, &params, &admissible_uids, &fi);
 }
 
 static int icom_dump(__a_unused char *line)
 {
-	ERROR_LOG("dump: %s\n", select_conf.format_arg);
 	select_cmdline_parser_dump(stdout, &select_conf);
 	return 1;
 }
@@ -109,6 +118,7 @@ int com_interactive(void)
 	char line[255];
 	int ret = 1;
 
+	select_cmdline_parser_init(&select_conf);
 	while (read_input_line(line, sizeof(line)) >= 0) {
 		size_t len = strlen(line);
 		if (!len)