From b7518b0b4e2c980be583a9aa25423fffea2177f0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 2 Dec 2010 09:12:03 -0700 Subject: [PATCH] Fix #7740 (Star count from added columns doubled in book detatils block). Also store queries generated by the advanced search dialog in the search history --- src/calibre/ebooks/metadata/book/base.py | 2 ++ src/calibre/gui2/search_box.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 125cd542b8..f0844e3711 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -531,6 +531,8 @@ class Metadata(object): res = format_date(res, cmeta['display'].get('date_format','dd MMM yyyy')) elif datatype == 'bool': res = _('Yes') if res else _('No') + elif datatype == 'rating': + res = res/2 return (name, unicode(res), orig_res, cmeta) # Translate aliases into the standard field name diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py index 1cdf622537..c85dafc6d8 100644 --- a/src/calibre/gui2/search_box.py +++ b/src/calibre/gui2/search_box.py @@ -384,7 +384,7 @@ class SearchBoxMixin(object): # {{{ def do_advanced_search(self, *args): d = SearchDialog(self, self.library_view.model().db) if d.exec_() == QDialog.Accepted: - self.search.set_search_string(d.search_string()) + self.search.set_search_string(d.search_string(), store_in_history=True) def do_search_button(self): self.search.do_search()