2007-02-12 Don Allingham <don@gramps-project.org>

* src/plugins/FindDupes.py: backport from 2.2.6



svn: r8095
This commit is contained in:
Don Allingham 2007-02-12 23:52:59 +00:00
parent 4cd6d41f79
commit ddccd7e7bc
4 changed files with 10 additions and 9 deletions

View File

@ -1,3 +1,6 @@
2007-02-12 Don Allingham <don@gramps-project.org>
* src/plugins/FindDupes.py: backport from 2.2.6
2007-02-12 Zsolt Foldvari <zfoldvar@users.sourceforge.net>
* src/MarkupText.py: cleanup
* src/DisplayTabs/_NoteTab.py (build_interface): debug log

View File

@ -331,7 +331,7 @@ class GrampsBSDDB(GrampsDbBase,UpdateCallback):
self.brief_name = os.path.basename(name)
self.env = db.DBEnv()
self.env.set_cachesize(0,0x2000000) # 16MB
self.env.set_cachesize(0,0x4000000) # 32MB
if self.UseTXN:
# These env settings are only needed for Txn environment

View File

@ -3356,12 +3356,6 @@ if __name__ == "__main__":
pr.runcall(g.parse_gedcom_file,False)
print "Finished"
pr.close()
## print "Loading profile"
## stats = hotshot.stats.load('mystats.profile')
## print "done"
## stats.strip_dirs()
## stats.sort_stats('time','calls')
## stats.print_stats(100)
else:
t = time.time()
g.parse_gedcom_file(False)

View File

@ -48,6 +48,7 @@ import Utils
import soundex
import NameDisplay
import ListModel
import Errors
from Merge import PersonCompare
import GrampsDisplay
import ManagedWindow
@ -173,8 +174,11 @@ class Merge(Tool.Tool,ManagedWindow.ManagedWindow):
_("No matches found"),
_("No potential duplicate people were found"))
else:
ShowMatches(self.dbstate,self.uistate,self.track,
self.list,self.map,self.update)
try:
ShowMatches(self.dbstate,self.uistate,self.track,
self.list,self.map,self.update)
except Errors.WindowActiveError:
pass
def find_potentials(self,thresh):
self.progress = Utils.ProgressMeter(_('Find duplicates'),