Remove some commented-out code

This commit is contained in:
Charles Haley 2010-05-26 12:30:41 +01:00
parent 462a55375c
commit fb13f2e7f4

View File

@ -380,29 +380,26 @@ class ResultCache(SearchQueryParser):
if location in ('tag', 'author', 'format', 'comment'): if location in ('tag', 'author', 'format', 'comment'):
location += 's' location += 's'
# all = ('title', 'authors', 'publisher', 'tags', 'comments', 'series',
# 'formats', 'isbn', 'rating', 'cover', 'ondevice')
MAP = {} MAP = {}
# 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']):
# self.tag_browser_categories[x]['kind'] == 'standard') \
# or self.tag_browser_categories[x]['kind'] == 'not_cat':
MAP[x] = self.FIELD_MAP[self.tag_browser_categories.get_label(x)] MAP[x] = self.FIELD_MAP[self.tag_browser_categories.get_label(x)]
# add custom columns to MAP. Put the column's type into IS_CUSTOM
IS_CUSTOM = [] IS_CUSTOM = []
for x in range(len(self.FIELD_MAP)): for x in range(len(self.FIELD_MAP)):
IS_CUSTOM.append('') IS_CUSTOM.append('')
IS_CUSTOM[self.FIELD_MAP['rating']] = 'rating' # normal and custom ratings columns use the same code # normal and custom ratings columns use the same code
IS_CUSTOM[self.FIELD_MAP['rating']] = 'rating'
# add custom columns to MAP. Put the column's type into IS_CUSTOM
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]['datatype'] != "datetime": if self.tag_browser_categories[x]['datatype'] != "datetime":
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']] 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():