From c0fbc32e4caf64715d7fb2014563d2aad947f05c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 24 May 2010 15:53:00 -0600
Subject: [PATCH] Fix search() behavior again

---
 src/calibre/library/caches.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py
index e943a4141e..10487af75a 100644
--- a/src/calibre/library/caches.py
+++ b/src/calibre/library/caches.py
@@ -628,14 +628,13 @@ class ResultCache(SearchQueryParser):
 
     def search(self, query, return_matches=False,
             ignore_search_restriction=False):
+        q = ''
         if not query or not query.strip():
-            q = ''
             if not ignore_search_restriction:
                 q = self.search_restriction
         else:
-            if ignore_search_restriction:
-                q = u'%s' % query
-            else:
+            q = query
+            if not ignore_search_restriction:
                 q = u'%s (%s)' % (self.search_restriction, query)
         if not q:
             if return_matches: