From ffe418a4c601ebd36c2fdb4f90b88510a8fa56cb Mon Sep 17 00:00:00 2001 From: Urban Wallasch Date: Tue, 22 Jun 2021 22:02:46 +0200 Subject: [PATCH] * Partial revert and subsequent fix of commit c7d08b7. --- jiten-pai.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jiten-pai.py b/jiten-pai.py index 26a91a4..7660fab 100755 --- a/jiten-pai.py +++ b/jiten-pai.py @@ -1314,13 +1314,13 @@ class jpMainWindow(QMainWindow): ok = True if len(dics) > 1: result.append(['#', d[0]]) - rdiff -= 1 + rdiff += 1 # search de-inflected verbs if len(inflist) > 0: r, ok = self._search_deinflected(inflist, d[1], mode, limit) self._search_show_progress() result.extend(r) - limit -= (len(r) + rdiff) + limit -= len(r) if limit <= 0: break if not ok: @@ -1333,7 +1333,7 @@ class jpMainWindow(QMainWindow): r, ok = dict_lookup(d[1], s_term, mode, limit) self._search_show_progress() result.extend(r) - limit -= (len(r) + rdiff) + limit -= len(r) if not ok: self._search_show_dict_error(d[0]) # relax search options @@ -1345,7 +1345,7 @@ class jpMainWindow(QMainWindow): break # report results rlen = len(result) - self.result_group.setTitle('Search results: %d%s' % (rlen + rdiff, '+' if rlen>=slimit else '')) + self.result_group.setTitle('Search results: %d%s' % (rlen - rdiff, '+' if (rlen-rdiff)>=slimit else '')) QApplication.processEvents() # format result if rlen > cfg['hardlimit'] / 2: -- 2.30.2