X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=04eed5503d18cb6d3b6e4d0cb127f98637d36b5d;hp=b15f83852e6919c4f0867065d13776c211416087;hb=HEAD;hpb=0b5c29fae8853bac16b91503df70b0e101dccca4

diff --git a/afs.c b/afs.c
index b15f8385..445d5871 100644
--- a/afs.c
+++ b/afs.c
@@ -437,18 +437,18 @@ static int activate_mood_or_playlist(const char *arg, struct para_buffer *pb)
 	int ret;
 	char *msg;
 
-	if (!arg) {
-		ret = mood_load(NULL, &msg);
+	if (!arg) { /* load dummy mood */
+		ret = mood_load(NULL, NULL, &msg);
 		mode = PLAY_MODE_MOOD;
 	} else if (!strncmp(arg, "p/", 2)) {
-		ret = playlist_load(arg + 2, &msg);
+		ret = playlist_load(arg + 2, NULL, &msg);
 		mode = PLAY_MODE_PLAYLIST;
 	} else if (!strncmp(arg, "m/", 2)) {
-		ret = mood_load(arg + 2, &msg);
+		ret = mood_load(arg + 2, NULL, &msg);
 		mode = PLAY_MODE_MOOD;
 	} else {
 		ret = -ERRNO_TO_PARA_ERROR(EINVAL);
-		msg = make_message("%s: parse error", arg);
+		msg = make_message("%s: parse error\n", arg);
 	}
 	if (pb)
 		para_printf(pb, "%s", msg);
@@ -529,8 +529,8 @@ static void init_admissible_files(const char *arg)
 {
 	int ret = activate_mood_or_playlist(arg, NULL);
 	if (ret < 0) {
-		PARA_WARNING_LOG("could not activate %s: %s\n", arg,
-			para_strerror(-ret));
+		PARA_WARNING_LOG("could not activate %s: %s\n", arg?
+			arg : "dummy", para_strerror(-ret));
 		if (arg)
 			activate_mood_or_playlist(NULL, NULL);
 	}
@@ -580,17 +580,6 @@ static void get_database_dir(void)
 	PARA_INFO_LOG("afs_database dir %s\n", database_dir);
 }
 
-static int make_database_dir(void)
-{
-	int ret;
-
-	get_database_dir();
-	ret = para_mkdir(database_dir, 0777);
-	if (ret >= 0 || ret == -ERRNO_TO_PARA_ERROR(EEXIST))
-		return 1;
-	return ret;
-}
-
 static int open_afs_tables(void)
 {
 	int i, ret;
@@ -962,7 +951,8 @@ __noreturn void afs_init(int socket_fd)
 	}
 	ret = schedule(&s);
 	sched_shutdown(&s);
-	mood_unload();
+	mood_unload(NULL);
+	playlist_unload(NULL);
 out_close:
 	close_afs_tables();
 out:
@@ -980,29 +970,32 @@ static int com_select_callback(struct afs_callback_arg *aca)
 	const struct lls_command *cmd = SERVER_CMD_CMD_PTR(SELECT);
 	const char *arg;
 	int ret;
+	struct para_buffer *pbout;
 
 	ret = lls_deserialize_parse_result(aca->query.data, cmd, &aca->lpr);
 	assert(ret >= 0);
 	arg = lls_input(0, aca->lpr);
+	pbout = SERVER_CMD_OPT_GIVEN(SELECT, VERBOSE, aca->lpr)?
+		&aca->pbout : NULL;
 	score_clear();
 	if (current_play_mode == PLAY_MODE_MOOD)
-		mood_unload();
+		mood_unload(NULL);
 	else
-		playlist_unload();
-	ret = activate_mood_or_playlist(arg, &aca->pbout);
+		playlist_unload(NULL);
+	ret = activate_mood_or_playlist(arg, pbout);
 	if (ret >= 0)
 		goto free_lpr;
 	/* ignore subsequent errors (but log them) */
 	if (current_mop && strcmp(current_mop, arg) != 0) {
 		int ret2;
 		afs_error(aca, "switching back to %s\n", current_mop);
-		ret2 = activate_mood_or_playlist(current_mop, &aca->pbout);
+		ret2 = activate_mood_or_playlist(current_mop, pbout);
 		if (ret2 >= 0)
 			goto free_lpr;
 		afs_error(aca, "could not reactivate %s: %s\n", current_mop,
 			para_strerror(-ret2));
 	}
-	activate_mood_or_playlist(NULL, &aca->pbout);
+	activate_mood_or_playlist(NULL, pbout);
 free_lpr:
 	lls_free_parse_result(aca->lpr, cmd);
 	return ret;
@@ -1018,7 +1011,8 @@ static int com_select(struct command_context *cc, struct lls_parse_result *lpr)
 		send_errctx(cc, errctx);
 		return ret;
 	}
-	return send_lls_callback_request(com_select_callback, cmd, lpr, cc);
+	ret = send_lls_callback_request(com_select_callback, cmd, lpr, cc);
+	return ret == osl(-E_OSL_RB_KEY_NOT_FOUND)? -E_BAD_MOP : ret;
 }
 EXPORT_SERVER_CMD_HANDLER(select);
 
@@ -1060,7 +1054,8 @@ static int com_init(struct command_context *cc, struct lls_parse_result *lpr)
 		.size = sizeof(table_mask)};
 	unsigned num_inputs = lls_num_inputs(lpr);
 
-	ret = make_database_dir();
+	get_database_dir();
+	ret = para_mkdir(database_dir);
 	if (ret < 0)
 		return ret;
 	if (num_inputs > 0) {