From 18786ae6464356693094c9020db1383e0e581729 Mon Sep 17 00:00:00 2001 From: Tim G L Lyons Date: Thu, 29 Aug 2013 18:05:25 +0000 Subject: [PATCH] 0006849: citationtreeview with search bar only searches in sources, not citation data 0006848: citationtreeview corrupts when search bar open and edit occurs 0006829: Searching into source/citation selector disallows to select all related citations, only matching rows by fixing treebasemodel so it properly deals with secondary objects, and also citationtreemodel so it adds secondary odes even when the parent is not present. svn: r22939 --- src/gui/selectors/selectcitation.py | 2 +- src/gui/views/treemodels/citationtreemodel.py | 7 ++ src/gui/views/treemodels/treebasemodel.py | 101 +++++++++++++----- src/plugins/view/citationtreeview.py | 12 +-- 4 files changed, 87 insertions(+), 35 deletions(-) diff --git a/src/gui/selectors/selectcitation.py b/src/gui/selectors/selectcitation.py index f7146806c..4d6a31b8f 100644 --- a/src/gui/selectors/selectcitation.py +++ b/src/gui/selectors/selectcitation.py @@ -63,7 +63,7 @@ class SelectCitation(BaseSelector): def get_column_titles(self): return [ - (_('Page'), 350, BaseSelector.TEXT, 0), + (_('Source: Title or Citation: Volume/Page'), 350, BaseSelector.TEXT, 0), (_('ID'), 75, BaseSelector.TEXT, 1) ] diff --git a/src/gui/views/treemodels/citationtreemodel.py b/src/gui/views/treemodels/citationtreemodel.py index aba31f959..4b4087c03 100644 --- a/src/gui/views/treemodels/citationtreemodel.py +++ b/src/gui/views/treemodels/citationtreemodel.py @@ -178,8 +178,15 @@ class CitationTreeModel(CitationBaseModel, TreeBaseModel): data The object data. """ sort_key = self.sort_func2(data) + # If the source for this citation already exists (in the tree model) we + # add the citation as a child of the source. Otherwise (if a search has + # found the citation) we add the citation as a child of nothing. if self.get_node(data[5]): + # parent child sortkey handle self.add_node(data[5], handle, sort_key, handle, secondary=True) + else: + # parent child sortkey handle + self.add_node(None, handle, sort_key, handle, secondary=True) def on_get_n_columns(self): return len(self.fmap)+1 diff --git a/src/gui/views/treemodels/treebasemodel.py b/src/gui/views/treemodels/treebasemodel.py index 1e0d38f1e..715ef2c79 100644 --- a/src/gui/views/treemodels/treebasemodel.py +++ b/src/gui/views/treemodels/treebasemodel.py @@ -331,7 +331,10 @@ class TreeBaseModel(gtk.GenericTreeModel): self.__displayed = 0 self.set_search(search) - self.rebuild_data(self.current_filter, skip) + if self.has_secondary: + self.rebuild_data(self.current_filter, self.current_filter2, skip) + else: + self.rebuild_data(self.current_filter, skip=skip) _LOG.debug(self.__class__.__name__ + ' __init__ ' + str(time.clock() - cput) + ' sec') @@ -350,7 +353,9 @@ class TreeBaseModel(gtk.GenericTreeModel): self.rebuild_data = None self._build_data = None self.search = None + self.search2 = None self.current_filter = None + self.current_filter2 = None self.clear_cache() self.lru_data = None @@ -442,31 +447,56 @@ class TreeBaseModel(gtk.GenericTreeModel): if search[0] == 1: # Filter #following is None if no data given in filter sidebar self.search = search[1] + if self.has_secondary: + self.search2 = search[1] + _LOG.debug("search2 filter %s %s" % (search[0], search[1])) self._build_data = self._rebuild_filter elif search[0] == 0: # Search if search[1]: # we have search[1] = (index, text_unicode, inversion) col, text, inv = search[1] - func = lambda x: self._get_value(x, col) or u"" + func = lambda x: self._get_value(x, col, secondary=False) or u"" + if self.has_secondary: + func2 = lambda x: self._get_value(x, col, secondary=True) or u"" if search[2]: self.search = ExactSearchFilter(func, text, inv) + if self.has_secondary: + self.search2 = ExactSearchFilter(func2, text, inv) else: self.search = SearchFilter(func, text, inv) + if self.has_secondary: + self.search2 = SearchFilter(func2, text, inv) else: self.search = None + if self.has_secondary: + self.search2 = None + _LOG.debug("search2 search with no data") self._build_data = self._rebuild_search else: # Fast filter self.search = search[1] + if self.has_secondary: + self.search2 = search[2] + _LOG.debug("search2 fast filter") self._build_data = self._rebuild_search else: self.search = None + if self.has_secondary: + self.search2 = search[2] + _LOG.debug("search2 no search parameter") self._build_data = self._rebuild_search self.current_filter = self.search + if self.has_secondary: + self.current_filter2 = self.search2 - def rebuild_data(self, data_filter=None, skip=[]): + def rebuild_data(self, data_filter=None, data_filter2=None, skip=[]): """ Rebuild the data map. + + When called externally (from listview), data_filter and data_filter2 + should be None; set_search will already have been called to establish + the filter functions. When called internally (from __init__) both + data_filter and data_filter2 will have been set from set_search """ cput = time.clock() self.clear_cache() @@ -476,16 +506,21 @@ class TreeBaseModel(gtk.GenericTreeModel): return self.clear() - self._build_data(self.current_filter, skip) + if self.has_secondary: + self._build_data(self.current_filter, self.current_filter2, skip) + else: + self._build_data(self.current_filter, None, skip) self._in_build = False self.current_filter = data_filter + if self.has_secondary: + self.current_filter2 = data_filter2 _LOG.debug(self.__class__.__name__ + ' rebuild_data ' + str(time.clock() - cput) + ' sec') - def _rebuild_search(self, dfilter, skip): + def _rebuild_search(self, dfilter, dfilter2, skip): """ Rebuild the data map where a search condition is applied. """ @@ -493,12 +528,14 @@ class TreeBaseModel(gtk.GenericTreeModel): self.__displayed = 0 items = self.number_items() + _LOG.debug("rebuild search primary") self.__rebuild_search(dfilter, skip, items, self.gen_cursor, self.add_row) if self.has_secondary: + _LOG.debug("rebuild search secondary") items = self.number_items2() - self.__rebuild_search(dfilter, skip, items, + self.__rebuild_search(dfilter2, skip, items, self.gen_cursor2, self.add_row2) def __rebuild_search(self, dfilter, skip, items, gen_cursor, add_func): @@ -520,12 +557,13 @@ class TreeBaseModel(gtk.GenericTreeModel): self.__total += 1 if not (handle in skip or (dfilter and not dfilter.match(handle, self.db))): + _LOG.debug(" add %s %s" % (handle, data)) self.__displayed += 1 add_func(handle, data) if not status.was_cancelled(): status.end() - def _rebuild_filter(self, dfilter, skip): + def _rebuild_filter(self, dfilter, dfilter2, skip): """ Rebuild the data map where a filter is applied. """ @@ -533,11 +571,13 @@ class TreeBaseModel(gtk.GenericTreeModel): self.__displayed = 0 items = self.number_items() + _LOG.debug("rebuild filter primary") self.__rebuild_filter(dfilter, skip, items, self.gen_cursor, self.map, self.add_row) if self.has_secondary: items = self.number_items2() - self.__rebuild_filter(dfilter, skip, items, + _LOG.debug("rebuild filter secondary") + self.__rebuild_filter(dfilter2, skip, items, self.gen_cursor2, self.map2, self.add_row2) def __rebuild_filter(self, dfilter, skip, items, gen_cursor, data_map, @@ -567,11 +607,14 @@ class TreeBaseModel(gtk.GenericTreeModel): status.heartbeat() if dfilter: + _LOG.debug("rebuild filter %s" % dfilter) + _LOG.debug(" list before filter %s" % handle_list) status_filter = progressdlg.LongOpStatus(msg=_("Applying filter"), total_steps=items, interval=items//10) pmon.add_op(status_filter) handle_list = dfilter.apply(self.db, handle_list, cb_progress=status_filter.heartbeat) + _LOG.debug(" list after filter %s" % handle_list) status_filter.end() status.heartbeat() @@ -724,13 +767,14 @@ class TreeBaseModel(gtk.GenericTreeModel): if self.get_node(handle) is not None: return # row already exists cput = time.clock() - if not self.search or \ - (self.search and self.search.match(handle, self.db)): - #row needs to be added to the model - data = self.map(handle) - if data: + data = self.map(handle) + if data: + if not self.search or \ + (self.search and self.search.match(handle, self.db)): self.add_row(handle, data) - else: + else: + if not self.search2 or \ + (self.search2 and self.search2.match(handle, self.db)): self.add_row2(handle, self.map2(handle)) _LOG.debug(self.__class__.__name__ + ' add_row_by_handle ' + @@ -845,10 +889,13 @@ class TreeBaseModel(gtk.GenericTreeModel): # according to column_defs table return self._get_value(node.handle, col, node.secondary) - def _get_value(self, handle, col, secondary=False): + def _get_value(self, handle, col, secondary=None): """ Returns the contents of a given column of a gramps object """ + if secondary is None: + raise NotImplementedError + if handle in self.lru_data: data = self.lru_data[handle] else: @@ -856,16 +903,20 @@ class TreeBaseModel(gtk.GenericTreeModel): data = self.map(handle) else: data = self.map2(handle) - if not self._in_build: - self.lru_data[handle] = data - - try: - if not secondary: - return (self.fmap[col](data)) - else: - return (self.fmap2[col](data)) - except: - return None + if not self._in_build: + self.lru_data[handle] = data + + if not secondary: + # None is used to indicate this column has no data + if self.fmap[col] is None: + return None + value = self.fmap[col](data) + else: + if self.fmap2[col] is None: + return None + value = self.fmap2[col](data) + + return value def on_get_iter(self, path): """ diff --git a/src/plugins/view/citationtreeview.py b/src/plugins/view/citationtreeview.py index 08de5c631..0ddd4b1e9 100644 --- a/src/plugins/view/citationtreeview.py +++ b/src/plugins/view/citationtreeview.py @@ -87,7 +87,7 @@ class CitationTreeView(ListView): COL_SRC_PINFO = 7 # name of the columns COLUMN_NAMES = [ - _('Title or Page'), + _('Source: Title or Citation: Volume/Page'), _('ID'), _('Date'), _('Confidence'), @@ -168,17 +168,11 @@ class CitationTreeView(ListView): def setup_filter(self): """ Override the setup of the default Search Bar in listview, so that only - the searchable source fields are shown. This includes renaming the - 'Title or Page' search to 'Title' + the searchable source fields are shown. """ - def name(i): - if i == 0: - return _('Title') - else: - return self.colinfo[i] self.search_bar.setup_filter( - [(name(pair[1]), pair[1], pair[1] in self.exact_search()) + [(self.colinfo[pair[1]], pair[1], pair[1] in self.exact_search()) for pair in self.column_order() if pair[0] and pair[1] in self.COLUMN_FILTERABLE])