From 81d4f9f7d14505eda3c13f3d18c3cc19ea1e39c2 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Thu, 31 Jan 2013 16:41:23 +0100 Subject: [PATCH] Bug fix for last regression test (--search related) --- plugins/generic/search.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/generic/search.py b/plugins/generic/search.py index 5b21f4420..ece3f8e05 100644 --- a/plugins/generic/search.py +++ b/plugins/generic/search.py @@ -534,8 +534,13 @@ class Search: for index in indexRange: query = rootQuery.blind.query2 - query = query % db - query += " AND %s" % colQuery + + if query.endswith("'%s')"): + query = query[:-1] + " AND %s)" % colQuery + else: + query += " AND %s" % colQuery + + query = safeStringFormat(query, db) query += whereTblsQuery query = agent.limitQuery(index, query)