Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from trunk

Browse Source
This commit is contained in:
Charles Haley 2010-05-25 11:49:01 +01:00
commit 9aebbc58d6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/library/caches.py
View File

@ -628,23 +628,24 @@ class ResultCache(SearchQueryParser):
def search(self, query, return_matches=False, def search(self, query, return_matches=False,
ignore_search_restriction=False): ignore_search_restriction=False):
q = ''
if not query or not query.strip(): if not query or not query.strip():
q = ''
if not ignore_search_restriction: if not ignore_search_restriction:
q = self.search_restriction q = self.search_restriction
elif not ignore_search_restriction: else:
q = u'%s (%s)' % (self.search_restriction, query) q = query
if not ignore_search_restriction:
q = u'%s (%s)' % (self.search_restriction, query)
if not q: if not q:
if return_matches: if return_matches:
return list(self._map) # when return_matches, do not update the maps! return list(self._map) # when return_matches, do not update the maps!
self._map_filtered = list(self._map) self._map_filtered = list(self._map)
return [] return
matches = sorted(self.parse(q)) matches = sorted(self.parse(q))
ans = [id for id in self._map if id in matches] ans = [id for id in self._map if id in matches]
if return_matches: if return_matches:
return ans return ans
self._map_filtered = ans self._map_filtered = ans
return []
def set_search_restriction(self, s): def set_search_restriction(self, s):
self.search_restriction = s self.search_restriction = s