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

Fix bareword searches trying to match against non-text types.

Browse Source
This commit is contained in:
Charles Haley 2010-05-26 14:48:53 +01:00
parent 149f979409
commit 3d38872b56
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -381,12 +381,17 @@ class ResultCache(SearchQueryParser):
location += 's' location += 's'
MAP = {} MAP = {}
# Fields not used when matching against text contents. These are
# the non-text fields
EXCLUDE_FIELDS = []
# get the db columns for the standard searchables # get the db columns for the standard searchables
for x in self.tag_browser_categories: for x in self.tag_browser_categories:
if (len(self.tag_browser_categories[x]['search_labels']) and \ if (len(self.tag_browser_categories[x]['search_labels']) and \
self.tag_browser_categories[x]['kind'] in ['standard', 'not_cat']): self.tag_browser_categories[x]['kind'] in ['standard', 'not_cat']):
MAP[x] = self.FIELD_MAP[self.tag_browser_categories.get_field_label(x)] MAP[x] = self.FIELD_MAP[self.tag_browser_categories.get_field_label(x)]
if self.tag_browser_categories[x]['datatype'] != 'text':
EXCLUDE_FIELDS.append(MAP[x])
# add custom columns to MAP. Put the column's type into IS_CUSTOM # add custom columns to MAP. Put the column's type into IS_CUSTOM
IS_CUSTOM = [] IS_CUSTOM = []
@ -399,8 +404,6 @@ class ResultCache(SearchQueryParser):
MAP[x] = self.FIELD_MAP[self.tag_browser_categories[x]['colnum']] MAP[x] = self.FIELD_MAP[self.tag_browser_categories[x]['colnum']]
IS_CUSTOM[MAP[x]] = self.tag_browser_categories[x]['datatype'] IS_CUSTOM[MAP[x]] = self.tag_browser_categories[x]['datatype']
# Some fields not used when matching against contents
EXCLUDE_FIELDS = [MAP['rating'], MAP['cover']]
SPLITABLE_FIELDS = [MAP['authors'], MAP['tags'], MAP['formats']] SPLITABLE_FIELDS = [MAP['authors'], MAP['tags'], MAP['formats']]
for x in self.tag_browser_categories.get_custom_fields(): for x in self.tag_browser_categories.get_custom_fields():
if self.tag_browser_categories[x]['is_multiple']: if self.tag_browser_categories[x]['is_multiple']:

16
src/calibre/library/tag_categories.py
View File

@ -36,7 +36,7 @@ class TagsMetadata(dict, DictMixin):
'kind':'standard', 'name':_('Authors'), 'kind':'standard', 'name':_('Authors'),
'search_labels':['authors', 'author']}), 'search_labels':['authors', 'author']}),
('series', {'table':'series', 'column':'name', ('series', {'table':'series', 'column':'name',
'datatype':None, 'is_multiple':False, 'datatype':'text', 'is_multiple':False,
'kind':'standard', 'name':_('Series'), 'kind':'standard', 'name':_('Series'),
'search_labels':['series']}), 'search_labels':['series']}),
('formats', {'table':None, 'column':None, ('formats', {'table':None, 'column':None,
@ -60,30 +60,34 @@ class TagsMetadata(dict, DictMixin):
'kind':'standard', 'name':_('Tags'), 'kind':'standard', 'name':_('Tags'),
'search_labels':['tags', 'tag']}), 'search_labels':['tags', 'tag']}),
('comments', {'table':None, 'column':None, ('comments', {'table':None, 'column':None,
'datatype':None, 'is_multiple':False, 'datatype':'text', 'is_multiple':False,
'kind':'not_cat', 'name':None, 'kind':'not_cat', 'name':None,
'search_labels':['comments', 'comment']}), 'search_labels':['comments', 'comment']}),
('cover', {'table':None, 'column':None, ('cover', {'table':None, 'column':None,
'datatype':None, 'is_multiple':False, 'datatype':None, 'is_multiple':False,
'kind':'not_cat', 'name':None, 'kind':'not_cat', 'name':None,
'search_labels':['cover']}), 'search_labels':['cover']}),
('timestamp', {'table':None, 'column':None,
'datatype':'datetime', 'is_multiple':False,
'kind':'not_cat', 'name':None,
'search_labels':['date']}),
('isbn', {'table':None, 'column':None, ('isbn', {'table':None, 'column':None,
'datatype':None, 'is_multiple':False, 'datatype':'text', 'is_multiple':False,
'kind':'not_cat', 'name':None, 'kind':'not_cat', 'name':None,
'search_labels':['isbn']}), 'search_labels':['isbn']}),
('pubdate', {'table':None, 'column':None, ('pubdate', {'table':None, 'column':None,
'datatype':None, 'is_multiple':False, 'datatype':'datetime', 'is_multiple':False,
'kind':'not_cat', 'name':None, 'kind':'not_cat', 'name':None,
'search_labels':['pubdate']}), 'search_labels':['pubdate']}),
('title', {'table':None, 'column':None, ('title', {'table':None, 'column':None,
'datatype':None, 'is_multiple':False, 'datatype':'text', 'is_multiple':False,
'kind':'not_cat', 'name':None, 'kind':'not_cat', 'name':None,
'search_labels':['title']}), 'search_labels':['title']}),
] ]
# search labels that are not db columns # search labels that are not db columns
search_items = [ 'all', search_items = [ 'all',
'date', # 'date',
'search', 'search',
] ]