* src/DataViews/_PersonView.py: Merge module support
* src/Merge/_MergeSource.py: broken out of MergeData.py * src/Merge/__init__.py: support of module * src/Merge/Makefile.am: added * src/Merge/_MergePlace.py: broken out of MergeData.py * src/Merge/_MergePerson.py: renamed svn: r6778
This commit is contained in:
parent
d5f33362ac
commit
305b3d7bd1
@ -1,4 +1,10 @@
|
|||||||
2006-05-25 Don Allingham <don@gramps-project.org>
|
2006-05-25 Don Allingham <don@gramps-project.org>
|
||||||
|
* src/DataViews/_PersonView.py: Merge module support
|
||||||
|
* src/Merge/_MergeSource.py: broken out of MergeData.py
|
||||||
|
* src/Merge/__init__.py: support of module
|
||||||
|
* src/Merge/Makefile.am: added
|
||||||
|
* src/Merge/_MergePlace.py: broken out of MergeData.py
|
||||||
|
* src/Merge/_MergePerson.py: renamed
|
||||||
* src/DataViews/_SourceView.py: source merge support
|
* src/DataViews/_SourceView.py: source merge support
|
||||||
* src/DataViews/_PlaceView.py: place merge support
|
* src/DataViews/_PlaceView.py: place merge support
|
||||||
* src/glade/mergedata.glade: place merge support
|
* src/glade/mergedata.glade: place merge support
|
||||||
|
@ -154,11 +154,11 @@ class PersonView(PageView.PersonNavView):
|
|||||||
ErrorDialog(msg,msg2)
|
ErrorDialog(msg,msg2)
|
||||||
else:
|
else:
|
||||||
from QuestionDialog import ErrorDialog
|
from QuestionDialog import ErrorDialog
|
||||||
from Merge import MergePeople
|
import Merge
|
||||||
p1 = self.db.get_person_from_handle(mlist[0])
|
p1 = self.db.get_person_from_handle(mlist[0])
|
||||||
p2 = self.db.get_person_from_handle(mlist[1])
|
p2 = self.db.get_person_from_handle(mlist[1])
|
||||||
if p1 and p2:
|
if p1 and p2:
|
||||||
merger = MergePeople.Compare(self.dbstate, self.uistate, p1, p2)
|
Merge.PersonCompare(self.dbstate, self.uistate, p1, p2)
|
||||||
else:
|
else:
|
||||||
msg = _("Cannot merge people")
|
msg = _("Cannot merge people")
|
||||||
msg2 = _("Exactly two people must be selected to perform a merge. "
|
msg2 = _("Exactly two people must be selected to perform a merge. "
|
||||||
@ -176,12 +176,12 @@ class PersonView(PageView.PersonNavView):
|
|||||||
"control key while clicking on the desired person.")
|
"control key while clicking on the desired person.")
|
||||||
ErrorDialog(msg,msg2)
|
ErrorDialog(msg,msg2)
|
||||||
else:
|
else:
|
||||||
from Merge import MergePeople
|
import Merge
|
||||||
|
|
||||||
p1 = self.db.get_person_from_handle(mlist[0])
|
p1 = self.db.get_person_from_handle(mlist[0])
|
||||||
p2 = self.db.get_person_from_handle(mlist[1])
|
p2 = self.db.get_person_from_handle(mlist[1])
|
||||||
if p1 and p2:
|
if p1 and p2:
|
||||||
MergePeople.MergePeopleUI(self.dbstate, self.uistate, p1, p2)
|
Merge.MergePeopleUI(self.dbstate, self.uistate, p1, p2)
|
||||||
else:
|
else:
|
||||||
msg = _("Cannot merge people")
|
msg = _("Cannot merge people")
|
||||||
msg2 = _("Exactly two people must be selected to perform a merge. "
|
msg2 = _("Exactly two people must be selected to perform a merge. "
|
||||||
|
@ -221,7 +221,7 @@ class PlaceView(PageView.ListView):
|
|||||||
"control key while clicking on the desired place.")
|
"control key while clicking on the desired place.")
|
||||||
ErrorDialog(msg,msg2)
|
ErrorDialog(msg,msg2)
|
||||||
else:
|
else:
|
||||||
import MergeData
|
import Merge
|
||||||
MergeData.MergePlaces(self.dbstate, self.uistate, mlist[0], mlist[1])
|
Merge.MergePlaces(self.dbstate, self.uistate, mlist[0], mlist[1])
|
||||||
|
|
||||||
|
|
||||||
|
@ -210,6 +210,6 @@ class SourceView(PageView.ListView):
|
|||||||
"control key while clicking on the desired source.")
|
"control key while clicking on the desired source.")
|
||||||
ErrorDialog(msg,msg2)
|
ErrorDialog(msg,msg2)
|
||||||
else:
|
else:
|
||||||
import MergeData
|
import Merge
|
||||||
MergeData.MergeSources(self.dbstate, self.uistate, mlist[0], mlist[1])
|
Merge.MergeSources(self.dbstate, self.uistate, mlist[0], mlist[1])
|
||||||
|
|
||||||
|
@ -8,6 +8,8 @@ pkgdatadir = $(datadir)/@PACKAGE@/Merge
|
|||||||
pkgdata_PYTHON = \
|
pkgdata_PYTHON = \
|
||||||
__init__.py \
|
__init__.py \
|
||||||
_MergePerson.py \
|
_MergePerson.py \
|
||||||
|
_MergePlace.py \
|
||||||
|
_MergeSource.py
|
||||||
|
|
||||||
pkgpyexecdir = @pkgpyexecdir@/Merge
|
pkgpyexecdir = @pkgpyexecdir@/Merge
|
||||||
pkgpythondir = @pkgpythondir@/Merge
|
pkgpythondir = @pkgpythondir@/Merge
|
||||||
|
@ -54,7 +54,7 @@ import GrampsDb
|
|||||||
|
|
||||||
sex = ( _("female"), _("male"), _("unknown"))
|
sex = ( _("female"), _("male"), _("unknown"))
|
||||||
|
|
||||||
class Compare(ManagedWindow.ManagedWindow):
|
class PersonCompare(ManagedWindow.ManagedWindow):
|
||||||
|
|
||||||
def __init__(self, dbstate, uistate, person1, person2, update=None) :
|
def __init__(self, dbstate, uistate, person1, person2, update=None) :
|
||||||
|
|
170
src/Merge/_MergePlace.py
Normal file
170
src/Merge/_MergePlace.py
Normal file
@ -0,0 +1,170 @@
|
|||||||
|
#
|
||||||
|
# Gramps - a GTK+/GNOME based genealogy program
|
||||||
|
#
|
||||||
|
# Copyright (C) 2000-2005 Donald N. Allingham
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 2 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program; if not, write to the Free Software
|
||||||
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
#
|
||||||
|
|
||||||
|
# $Id$
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------
|
||||||
|
#
|
||||||
|
# Standard python modules
|
||||||
|
#
|
||||||
|
#-------------------------------------------------------------------------
|
||||||
|
from gettext import gettext as _
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------
|
||||||
|
#
|
||||||
|
# GNOME
|
||||||
|
#
|
||||||
|
#-------------------------------------------------------------------------
|
||||||
|
import gtk
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------
|
||||||
|
#
|
||||||
|
# GRAMPS modules
|
||||||
|
#
|
||||||
|
#-------------------------------------------------------------------------
|
||||||
|
import const
|
||||||
|
import GrampsDisplay
|
||||||
|
import ManagedWindow
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------
|
||||||
|
#
|
||||||
|
# Merge Places
|
||||||
|
#
|
||||||
|
#-------------------------------------------------------------------------
|
||||||
|
class MergePlaces(ManagedWindow.ManagedWindow):
|
||||||
|
"""
|
||||||
|
Merges to places into a single place. Displays a dialog box that
|
||||||
|
allows the places to be combined into one.
|
||||||
|
"""
|
||||||
|
def __init__(self, dbstate, uistate, new_handle, old_handle):
|
||||||
|
|
||||||
|
ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__)
|
||||||
|
|
||||||
|
self.db = dbstate.db
|
||||||
|
self.new_handle = new_handle
|
||||||
|
self.old_handle = old_handle
|
||||||
|
self.p1 = self.db.get_place_from_handle(self.new_handle)
|
||||||
|
self.p2 = self.db.get_place_from_handle(self.old_handle)
|
||||||
|
|
||||||
|
self.glade = gtk.glade.XML(const.merge_glade,"merge_places","gramps")
|
||||||
|
self.set_window(self.glade.get_widget("merge_places"),
|
||||||
|
self.glade.get_widget('title'),
|
||||||
|
_("Select title"))
|
||||||
|
|
||||||
|
self.glade.get_widget("title1_text").set_text(self.p1.get_title())
|
||||||
|
self.glade.get_widget("title2_text").set_text(self.p2.get_title())
|
||||||
|
self.t3 = self.glade.get_widget("title3_text")
|
||||||
|
self.t3.set_text(self.p1.get_title())
|
||||||
|
|
||||||
|
self.glade.get_widget('cancel').connect('clicked', self.close_window)
|
||||||
|
self.glade.get_widget('ok').connect('clicked', self.merge)
|
||||||
|
self.glade.get_widget('help').connect('clicked', self.help)
|
||||||
|
|
||||||
|
self.show()
|
||||||
|
|
||||||
|
def close_window(self, obj):
|
||||||
|
self.close()
|
||||||
|
|
||||||
|
def build_menu_names(self,obj):
|
||||||
|
return (_('Merge Places'),None)
|
||||||
|
|
||||||
|
def help(self,obj):
|
||||||
|
"""Display the relevant portion of GRAMPS manual"""
|
||||||
|
GrampsDisplay.help('adv-merge-places')
|
||||||
|
|
||||||
|
def merge(self,obj):
|
||||||
|
"""
|
||||||
|
Performs the merge of the places when the merge button is clicked.
|
||||||
|
"""
|
||||||
|
t2active = self.glade.get_widget("title2").get_active()
|
||||||
|
|
||||||
|
if t2active:
|
||||||
|
self.p1.set_title(self.p2.get_title())
|
||||||
|
elif self.glade.get_widget("title3").get_active():
|
||||||
|
self.p1.set_title(unicode(self.t3.get_text()))
|
||||||
|
|
||||||
|
# Set longitude
|
||||||
|
if self.p1.get_longitude() == "" and self.p2.get_longitude() != "":
|
||||||
|
self.p1.set_longitude(self.p2.get_longitude())
|
||||||
|
|
||||||
|
# Set latitude
|
||||||
|
if self.p1.get_latitude() == "" and self.p2.get_latitude() != "":
|
||||||
|
self.p1.set_latitude(self.p2.get_latitude())
|
||||||
|
|
||||||
|
# Add URLs from P2 to P1
|
||||||
|
for url in self.p2.get_url_list():
|
||||||
|
self.p1.add_url(url)
|
||||||
|
|
||||||
|
# Copy photos from P2 to P1
|
||||||
|
for photo in self.p2.get_media_list():
|
||||||
|
self.p1.add_media_reference(photo)
|
||||||
|
|
||||||
|
# Copy sources from P2 to P1
|
||||||
|
for source in self.p2.get_source_references():
|
||||||
|
self.p1.add_source(source)
|
||||||
|
|
||||||
|
# Add notes from P2 to P1
|
||||||
|
note = self.p2.get_note()
|
||||||
|
if note != "":
|
||||||
|
if self.p1.get_note() == "":
|
||||||
|
self.p1.set_note(note)
|
||||||
|
elif self.p1.get_note() != note:
|
||||||
|
self.p1.set_note("%s\n\n%s" % (self.p1.get_note(),note))
|
||||||
|
|
||||||
|
if t2active:
|
||||||
|
lst = [self.p1.get_main_location()] + self.p1.get_alternate_locations()
|
||||||
|
self.p1.set_main_location(self.p2.get_main_location())
|
||||||
|
for l in lst:
|
||||||
|
if not l.is_empty():
|
||||||
|
self.p1.add_alternate_locations(l)
|
||||||
|
else:
|
||||||
|
lst = [self.p2.get_main_location()] + self.p2.get_alternate_locations()
|
||||||
|
for l in lst:
|
||||||
|
if not l.is_empty():
|
||||||
|
self.p1.add_alternate_locations(l)
|
||||||
|
|
||||||
|
# remove old and commit new source
|
||||||
|
trans = self.db.transaction_begin()
|
||||||
|
|
||||||
|
self.db.remove_place(self.old_handle,trans)
|
||||||
|
self.db.commit_place(self.p1,trans)
|
||||||
|
|
||||||
|
# replace references in other objetcs
|
||||||
|
# people
|
||||||
|
for handle in self.db.get_person_handles(sort_handles=False):
|
||||||
|
person = self.db.get_person_from_handle(handle)
|
||||||
|
if person.has_handle_reference('Place',self.old_handle):
|
||||||
|
person.replace_handle_reference('Place',self.old_handle,self.new_handle)
|
||||||
|
self.db.commit_person(person,trans)
|
||||||
|
# families
|
||||||
|
for handle in self.db.get_family_handles():
|
||||||
|
family = self.db.get_family_from_handle(handle)
|
||||||
|
if family.has_handle_reference('Place',self.old_handle):
|
||||||
|
family.replace_handle_reference('Place',self.old_handle,self.new_handle)
|
||||||
|
self.db.commit_family(family,trans)
|
||||||
|
# events
|
||||||
|
for handle in self.db.get_event_handles():
|
||||||
|
event = self.db.get_event_from_handle(handle)
|
||||||
|
if event.has_handle_reference('Place',self.old_handle):
|
||||||
|
event.replace_handle_reference('Place',self.old_handle,self.new_handle)
|
||||||
|
self.db.commit_event(event,trans)
|
||||||
|
|
||||||
|
self.db.transaction_commit(trans,_("Merge Places"))
|
||||||
|
self.close()
|
@ -18,7 +18,7 @@
|
|||||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
#
|
#
|
||||||
|
|
||||||
# $Id$
|
# $Id: MergeData.py 6777 2006-05-25 20:35:04Z dallingham $
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
@ -43,132 +43,6 @@ import const
|
|||||||
import GrampsDisplay
|
import GrampsDisplay
|
||||||
import ManagedWindow
|
import ManagedWindow
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
|
||||||
#
|
|
||||||
# Merge Places
|
|
||||||
#
|
|
||||||
#-------------------------------------------------------------------------
|
|
||||||
class MergePlaces(ManagedWindow.ManagedWindow):
|
|
||||||
"""
|
|
||||||
Merges to places into a single place. Displays a dialog box that
|
|
||||||
allows the places to be combined into one.
|
|
||||||
"""
|
|
||||||
def __init__(self, dbstate, uistate, new_handle, old_handle):
|
|
||||||
|
|
||||||
ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__)
|
|
||||||
|
|
||||||
self.db = dbstate.db
|
|
||||||
self.new_handle = new_handle
|
|
||||||
self.old_handle = old_handle
|
|
||||||
self.p1 = self.db.get_place_from_handle(self.new_handle)
|
|
||||||
self.p2 = self.db.get_place_from_handle(self.old_handle)
|
|
||||||
|
|
||||||
self.glade = gtk.glade.XML(const.merge_glade,"merge_places","gramps")
|
|
||||||
self.set_window(self.glade.get_widget("merge_places"),
|
|
||||||
self.glade.get_widget('title'),
|
|
||||||
_("Select title"))
|
|
||||||
|
|
||||||
self.glade.get_widget("title1_text").set_text(self.p1.get_title())
|
|
||||||
self.glade.get_widget("title2_text").set_text(self.p2.get_title())
|
|
||||||
self.t3 = self.glade.get_widget("title3_text")
|
|
||||||
self.t3.set_text(self.p1.get_title())
|
|
||||||
|
|
||||||
self.glade.get_widget('cancel').connect('clicked', self.close_window)
|
|
||||||
self.glade.get_widget('ok').connect('clicked', self.merge)
|
|
||||||
self.glade.get_widget('help').connect('clicked', self.help)
|
|
||||||
|
|
||||||
self.show()
|
|
||||||
|
|
||||||
def close_window(self, obj):
|
|
||||||
self.close()
|
|
||||||
|
|
||||||
def build_menu_names(self,obj):
|
|
||||||
return (_('Merge Places'),None)
|
|
||||||
|
|
||||||
def help(self,obj):
|
|
||||||
"""Display the relevant portion of GRAMPS manual"""
|
|
||||||
GrampsDisplay.help('adv-merge-places')
|
|
||||||
|
|
||||||
def merge(self,obj):
|
|
||||||
"""
|
|
||||||
Performs the merge of the places when the merge button is clicked.
|
|
||||||
"""
|
|
||||||
t2active = self.glade.get_widget("title2").get_active()
|
|
||||||
|
|
||||||
if t2active:
|
|
||||||
self.p1.set_title(self.p2.get_title())
|
|
||||||
elif self.glade.get_widget("title3").get_active():
|
|
||||||
self.p1.set_title(unicode(self.t3.get_text()))
|
|
||||||
|
|
||||||
# Set longitude
|
|
||||||
if self.p1.get_longitude() == "" and self.p2.get_longitude() != "":
|
|
||||||
self.p1.set_longitude(self.p2.get_longitude())
|
|
||||||
|
|
||||||
# Set latitude
|
|
||||||
if self.p1.get_latitude() == "" and self.p2.get_latitude() != "":
|
|
||||||
self.p1.set_latitude(self.p2.get_latitude())
|
|
||||||
|
|
||||||
# Add URLs from P2 to P1
|
|
||||||
for url in self.p2.get_url_list():
|
|
||||||
self.p1.add_url(url)
|
|
||||||
|
|
||||||
# Copy photos from P2 to P1
|
|
||||||
for photo in self.p2.get_media_list():
|
|
||||||
self.p1.add_media_reference(photo)
|
|
||||||
|
|
||||||
# Copy sources from P2 to P1
|
|
||||||
for source in self.p2.get_source_references():
|
|
||||||
self.p1.add_source(source)
|
|
||||||
|
|
||||||
# Add notes from P2 to P1
|
|
||||||
note = self.p2.get_note()
|
|
||||||
if note != "":
|
|
||||||
if self.p1.get_note() == "":
|
|
||||||
self.p1.set_note(note)
|
|
||||||
elif self.p1.get_note() != note:
|
|
||||||
self.p1.set_note("%s\n\n%s" % (self.p1.get_note(),note))
|
|
||||||
|
|
||||||
if t2active:
|
|
||||||
lst = [self.p1.get_main_location()] + self.p1.get_alternate_locations()
|
|
||||||
self.p1.set_main_location(self.p2.get_main_location())
|
|
||||||
for l in lst:
|
|
||||||
if not l.is_empty():
|
|
||||||
self.p1.add_alternate_locations(l)
|
|
||||||
else:
|
|
||||||
lst = [self.p2.get_main_location()] + self.p2.get_alternate_locations()
|
|
||||||
for l in lst:
|
|
||||||
if not l.is_empty():
|
|
||||||
self.p1.add_alternate_locations(l)
|
|
||||||
|
|
||||||
# remove old and commit new source
|
|
||||||
trans = self.db.transaction_begin()
|
|
||||||
|
|
||||||
self.db.remove_place(self.old_handle,trans)
|
|
||||||
self.db.commit_place(self.p1,trans)
|
|
||||||
|
|
||||||
# replace references in other objetcs
|
|
||||||
# people
|
|
||||||
for handle in self.db.get_person_handles(sort_handles=False):
|
|
||||||
person = self.db.get_person_from_handle(handle)
|
|
||||||
if person.has_handle_reference('Place',self.old_handle):
|
|
||||||
person.replace_handle_reference('Place',self.old_handle,self.new_handle)
|
|
||||||
self.db.commit_person(person,trans)
|
|
||||||
# families
|
|
||||||
for handle in self.db.get_family_handles():
|
|
||||||
family = self.db.get_family_from_handle(handle)
|
|
||||||
if family.has_handle_reference('Place',self.old_handle):
|
|
||||||
family.replace_handle_reference('Place',self.old_handle,self.new_handle)
|
|
||||||
self.db.commit_family(family,trans)
|
|
||||||
# events
|
|
||||||
for handle in self.db.get_event_handles():
|
|
||||||
event = self.db.get_event_from_handle(handle)
|
|
||||||
if event.has_handle_reference('Place',self.old_handle):
|
|
||||||
event.replace_handle_reference('Place',self.old_handle,self.new_handle)
|
|
||||||
self.db.commit_event(event,trans)
|
|
||||||
|
|
||||||
self.db.transaction_commit(trans,_("Merge Places"))
|
|
||||||
self.close()
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
# Merge Sources
|
# Merge Sources
|
@ -23,4 +23,6 @@
|
|||||||
"""
|
"""
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from MergePeople import MergePeople
|
from _MergePerson import *
|
||||||
|
from _MergePlace import *
|
||||||
|
from _MergeSource import *
|
||||||
|
Loading…
x
Reference in New Issue
Block a user