From b5fc21b9f442904608a73e3c705e498c55769843 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 29 Oct 2013 19:29:22 +0100 Subject: Revert "command: new commands "findin", "searchin" with base URI" This reverts commit a577944ab5a1f4d688e5901fa3efaf7cd1673588. Will be replaced by new options for the old commands "search" and "find". --- src/command/DatabaseCommands.cxx | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'src/command/DatabaseCommands.cxx') diff --git a/src/command/DatabaseCommands.cxx b/src/command/DatabaseCommands.cxx index 16e10b4de..b86cbdae7 100644 --- a/src/command/DatabaseCommands.cxx +++ b/src/command/DatabaseCommands.cxx @@ -55,8 +55,7 @@ handle_lsinfo2(Client &client, int argc, char *argv[]) } static CommandResult -handle_match(Client &client, int argc, char *argv[], - const char *uri, bool fold_case) +handle_match(Client &client, int argc, char *argv[], bool fold_case) { SongFilter filter; if (!filter.Parse(argc - 1, argv + 1, fold_case)) { @@ -64,7 +63,7 @@ handle_match(Client &client, int argc, char *argv[], return CommandResult::ERROR; } - const DatabaseSelection selection(uri, true, &filter); + const DatabaseSelection selection("", true, &filter); Error error; return db_selection_print(client, selection, true, error) @@ -75,25 +74,13 @@ handle_match(Client &client, int argc, char *argv[], CommandResult handle_find(Client &client, int argc, char *argv[]) { - return handle_match(client, argc, argv, "", false); -} - -CommandResult -handle_find_in(Client &client, int argc, char *argv[]) -{ - return handle_match(client, argc - 1, argv + 1, argv[1], false); + return handle_match(client, argc, argv, false); } CommandResult handle_search(Client &client, int argc, char *argv[]) { - return handle_match(client, argc, argv, "", true); -} - -CommandResult -handle_search_in(Client &client, int argc, char *argv[]) -{ - return handle_match(client, argc - 1, argv + 1, argv[1], true); + return handle_match(client, argc, argv, true); } static CommandResult -- cgit v1.2.3