Integrate fix for multiple search terms

This commit is contained in:
Charles Haley 2011-01-25 22:20:11 +00:00
parent e15c23c11c
commit 0b0662c632

View File

@ -472,15 +472,14 @@ class FieldMetadata(dict):
self.custom_label_to_key_map[label+'_index'] = key self.custom_label_to_key_map[label+'_index'] = key
def remove_dynamic_categories(self): def remove_dynamic_categories(self):
keys = list(self._tb_cats.keys())[:] for key in list(self._tb_cats.keys()):
for key in keys:
val = self._tb_cats[key] val = self._tb_cats[key]
if val['is_category'] and val['kind'] in ('user', 'search'): if val['is_category'] and val['kind'] in ('user', 'search'):
del self._tb_cats[key] del self._tb_cats[key]
if key in self._search_term_map: if key in self._search_term_map:
del self._search_term_map[key] del self._search_term_map[key]
if key.lower() in self._search_term_map: if key in self._search_term_map:
del self._search_term_map[key.lower()] del self._search_term_map[key]
def cc_series_index_column_for(self, key): def cc_series_index_column_for(self, key):
return self._tb_cats[key]['rec_index'] + 1 return self._tb_cats[key]['rec_index'] + 1