Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/AddSpouse.py (select_spouse_clicked): Prevent adding oneself

Browse Source 
and oneself's parents as a spouse; When aborting, do not close dialog.
* src/RelLib.py (BaseObject): Add base data class, to support
capabilites common to all gramps objects; (matches_string,
matches_regexp): Add methods for searching textual objects;
(Person,Family,Event,Place,Source,MediaRef,LdsOrd,Attribute,Address,
Name,Location,Note,Url,Witness,SourceRef): Add methods for determining
textual objects and children with textual objects.


svn: r4182
This commit is contained in:
Alex Roitman 2005-03-15 05:23:12 +00:00
parent 00ed8a7693
commit d2e476e956
3 changed files with 397 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gramps2/ChangeLog
View File

@ -1,3 +1,13 @@
2005-03-14 Alex Roitman <shura@gramps-project.org>
* src/AddSpouse.py (select_spouse_clicked): Prevent adding oneself
and oneself's parents as a spouse; When aborting, do not close dialog.
* src/RelLib.py (BaseObject): Add base data class, to support
capabilites common to all gramps objects; (matches_string,
matches_regexp): Add methods for searching textual objects;
(Person,Family,Event,Place,Source,MediaRef,LdsOrd,Attribute,Address,
Name,Location,Note,Url,Witness,SourceRef): Add methods for determining
textual objects and children with textual objects.
2005-03-14 Don Allingham <don@gramps-project.org>
* src/gramps_main.py: use new GRAMPS homepage

20
gramps2/src/AddSpouse.py
View File

@ -243,6 +243,21 @@ class AddSpouse:
spouse = self.db.get_person_from_handle(idlist[0])
spouse_id = spouse.get_handle()
# don't do anything if adding self
if spouse_id == self.person.get_handle():
ErrorDialog(_("Error adding a spouse"),
_("A person cannot be linked as his/her spouse"))
return
# don't do anything if adding a parent
for (family_handle,frel,mrel) in self.person.get_parent_family_handle_list():
family = self.db.get_family_from_handle(family_handle)
if spouse_id in [family.get_mother_handle(),family.get_father_handle()]:
ErrorDialog(_("Error adding a spouse"),
_("A person cannot be linked as his/her "
"child's spouse"))
return
# don't do anything if the marriage already exists
for f in self.person.get_family_handle_list():
fam = self.db.get_family_from_handle(f)
@ -251,12 +266,11 @@ class AddSpouse:
(fam.get_mother_handle(),fam.get_father_handle()):
ErrorDialog(_("Error adding a spouse"),
_("The spouse is already present in this family"))
Utils.destroy_passed_object(obj)
return
if spouse_id in fam.get_child_handle_list():
ErrorDialog(_("Error adding a spouse"),
_("A person cannot be linked as his/her own parent"))
Utils.destroy_passed_object(obj)
_("A person cannot be linked as his/her "
"parent's spouse"))
return
trans = self.db.transaction_begin()

379
gramps2/src/RelLib.py
View File

@ -35,6 +35,7 @@ from gettext import gettext as _
import os
import os.path
import time
import re
#-------------------------------------------------------------------------
#
@ -61,8 +62,94 @@ CONF_VERY_LOW = 0
# Class definitions
#
#-------------------------------------------------------------------------
class BaseObject:
"""
The BaseObject is the base class for all data objects in GRAMPS,
whether primary or not. Its main goal is to provide common capabilites
to all objects, such as searching through all available information.
"""
def __init__(self):
"""
Initialize a BaseObject.
"""
pass
def matches_string(self,pattern,case_sensitive=False):
"""
Returns True if any text data in the object or any of it's child
objects matches a given pattern.
class PrimaryObject:
@param pattern: The pattern to match.
@type pattern: str
@param case_sensitive: Whether the match is case-sensitive.
@type case_sensitive: bool
@return: Returns whether any text data in the object or any of it's child objects matches a given pattern.
@rtype: bool
"""
# Run through its own items
patern_upper = pattern.upper()
for item in self.get_text_data_list():
if case_sensitive:
if item.find(pattern) != -1:
return True
else:
if item.upper().find(patern_upper) != -1:
return True
# Run through child objects
for obj in self.get_text_data_child_list():
if obj.matches_string(pattern,case_sensitive):
return True
return False
def matches_regexp(self,pattern,case_sensitive=False):
"""
Returns True if any text data in the object or any of it's child
objects matches a given regular expression.
@param pattern: The pattern to match.
@type pattern: str
@return: Returns whether any text data in the object or any of it's child objects matches a given regexp.
@rtype: bool
"""
# Run through its own items
if case_sensitive:
pattern_obj = re.compile(pattern)
else:
pattern_obj = re.compile(pattern,re.IGNORECASE)
for item in self.get_text_data_list():
if pattern_obj.match(item):
return True
# Run through child objects
for obj in self.get_text_data_child_list():
if obj.matches_regexp(pattern,case_sensitive):
return True
return False
def get_text_data_list(self):
"""
Returns the list of all textual attributes of the object.
@return: Returns the list of all textual attributes of the object.
@rtype: list
"""
return []
def get_text_data_child_list(self):
"""
Returns the list of child objects that may carry textual data.
@return: Returns the list of child objects that may carry textual data.
@rtype: list
"""
return []
class PrimaryObject(BaseObject):
"""
The PrimaryObject is the base class for all primary objects in the
database. Primary objects are the core objects in the database.
@ -149,7 +236,7 @@ class PrimaryObject:
"""
return self.gramps_id
class SourceNote:
class SourceNote(BaseObject):
"""
Base class for storing source references and notes
"""
@ -465,6 +552,29 @@ class Person(PrimaryObject,DataObj):
self.lds_seal, self.complete, self.source_list, self.note,
self.change,self.private) = (data + (False,))[0:23]
def get_text_data_list(self):
"""
Returns the list of all textual attributes of the object.
@return: Returns the list of all textual attributes of the object.
@rtype: list
"""
return [self.nickname]
def get_text_data_child_list(self):
"""
Returns the list of child objects that may carry textual data.
@return: Returns the list of child objects that may carry textual data.
@rtype: list
"""
check_list = [self.lds_bapt,self.lds_endow,self.lds_seal,self.note]
add_list = [item for item in check_list if item]
return [self.primary_name] + self.media_list + \
self.alternate_names + self.address_list + \
self.attribute_list + self.urls + \
self.source_list + add_list
def get_sourcref_child_list(self):
"""
Returns the list of child secondary objects that may refer sources.
@ -1188,6 +1298,17 @@ class Family(PrimaryObject,SourceNote):
self.media_list, self.attribute_list, self.lds_seal,
self.complete, self.source_list, self.note, self.change) = data
def get_text_data_child_list(self):
"""
Returns the list of child objects that may carry textual data.
@return: Returns the list of child objects that may carry textual data.
@rtype: list
"""
check_list = [self.lds_seal,self.note]
add_list = [item for item in check_list if item]
return self.media_list + self.attribute_list + add_list
def get_sourcref_child_list(self):
"""
Returns the list of child secondary objects that may refer sources.
@ -1195,7 +1316,7 @@ class Family(PrimaryObject,SourceNote):
@return: Returns the list of child secondary child objects that may refer sources.
@rtype: list
"""
check_list = self.media_list + self.attribute_list
check_list = self.media_list + self.attribute_list + self.source_list
if self.lds_seal:
check_list.append(self.lds_seal)
return check_list
@ -1548,6 +1669,29 @@ class Event(PrimaryObject,DataObj):
self.place, self.cause, self.private, self.source_list,
self.note, self.witness, self.media_list, self.change) = data
def get_text_data_list(self):
"""
Returns the list of all textual attributes of the object.
@return: Returns the list of all textual attributes of the object.
@rtype: list
"""
return [self.description,self.name,self.cause]
def get_text_data_child_list(self):
"""
Returns the list of child objects that may carry textual data.
@return: Returns the list of child objects that may carry textual data.
@rtype: list
"""
check_list = self.media_list + self.source_list
if self.witness:
check_list = check_list + self.witness
if self.note:
check_list.append(note)
return check_list
def get_sourcref_child_list(self):
"""
Returns the list of child secondary objects that may refer sources.
@ -1887,6 +2031,28 @@ class Place(PrimaryObject,SourceNote):
self.main_loc, self.alt_loc, self.urls, self.media_list,
self.source_list, self.note, self.change) = data
def get_text_data_list(self):
"""
Returns the list of all textual attributes of the object.
@return: Returns the list of all textual attributes of the object.
@rtype: list
"""
return [self.long,self.lat,self.title]
def get_text_data_child_list(self):
"""
Returns the list of child objects that may carry textual data.
@return: Returns the list of child objects that may carry textual data.
@rtype: list
"""
check_list = [self.main_loc,self.note]
add_list = [item for item in check_list if item]
return self.media_list + self.source_list + self.alt_loc \
+ self.urls + add_list
def get_sourcref_child_list(self):
"""
Returns the list of child secondary objects that may refer sources.
@ -2149,6 +2315,28 @@ class MediaObject(PrimaryObject,SourceNote):
self.attrlist, self.source_list, self.note, self.change,
self.date, self.place) = data
def get_text_data_list(self):
"""
Returns the list of all textual attributes of the object.
@return: Returns the list of all textual attributes of the object.
@rtype: list
"""
return [self.path,self.mime,self.desc]
def get_text_data_child_list(self):
"""
Returns the list of child objects that may carry textual data.
@return: Returns the list of child objects that may carry textual data.
@rtype: list
"""
check_list = self.attrlist + self.source_list
if self.note:
check_list.append(self.note)
return check_list
def get_sourcref_child_list(self):
"""
Returns the list of child secondary objects that may refer sources.
@ -2297,6 +2485,27 @@ class Source(PrimaryObject):
self.pubinfo, self.note, self.media_list,
self.abbrev, self.change, self.datamap) = data
def get_text_data_list(self):
"""
Returns the list of all textual attributes of the object.
@return: Returns the list of all textual attributes of the object.
@rtype: list
"""
return [self.title,self.author,self.pubinfo,self.abbrev]
def get_text_data_child_list(self):
"""
Returns the list of child objects that may carry textual data.
@return: Returns the list of child objects that may carry textual data.
@rtype: list
"""
check_list = self.attrlist + self.source_list
if self.note:
check_list.append(self.note)
return check_list
def get_sourcref_child_list(self):
"""
Returns the list of child secondary objects that may refer sources.
@ -2470,6 +2679,27 @@ class LdsOrd(SourceNote):
self.status = 0
self.place = None
def get_text_data_list(self):
"""
Returns the list of all textual attributes of the object.
@return: Returns the list of all textual attributes of the object.
@rtype: list
"""
return [self.temple]
def get_text_data_child_list(self):
"""
Returns the list of child objects that may carry textual data.
@return: Returns the list of child objects that may carry textual data.
@rtype: list
"""
check_list = self.source_list
if self.note:
check_list.append(self.note)
return check_list
def set_place_handle(self,place):
"""sets the Place database handle of the ordinance"""
self.place = place
@ -2646,7 +2876,7 @@ class Researcher:
if email:
self.email = email.strip()
class Location:
class Location(BaseObject):
"""Provides information about a place, including city, county, state,
and country. Multiple Location objects can represent the same place,
since names of citys, countys, states, and even countries can change
@ -2671,6 +2901,16 @@ class Location:
self.postal = ""
self.phone = ""
def get_text_data_list(self):
"""
Returns the list of all textual attributes of the object.
@return: Returns the list of all textual attributes of the object.
@rtype: list
"""
return [self.city,self.parish,self.county,self.state,
self.country,self.postal,self.phone]
def is_empty(self):
return not self.city and not self.county and not self.state and \
not self.country and not self.postal and not self.phone
@ -2731,7 +2971,7 @@ class Location:
"""returns the country name of the Location object"""
return self.country
class Note:
class Note(BaseObject):
"""
Introduction
============
@ -2747,6 +2987,15 @@ class Note:
self.text = text
self.format = 0
def get_text_data_list(self):
"""
Returns the list of all textual attributes of the object.
@return: Returns the list of all textual attributes of the object.
@rtype: list
"""
return [self.text]
def set(self,text):
"""
Sets the text associated with the note to the passed string.
@ -2813,6 +3062,18 @@ class MediaRef(SourceNote):
self.note = None
self.rect = None
def get_text_data_child_list(self):
"""
Returns the list of child objects that may carry textual data.
@return: Returns the list of child objects that may carry textual data.
@rtype: list
"""
check_list = self.attrlist + self.source_list
if self.note:
check_list.append(self.note)
return check_list
def get_sourcref_child_list(self):
"""
Returns the list of child secondary objects that may refer sources.
@ -2884,6 +3145,27 @@ class Attribute(DataObj):
self.type = ""
self.value = ""
def get_text_data_list(self):
"""
Returns the list of all textual attributes of the object.
@return: Returns the list of all textual attributes of the object.
@rtype: list
"""
return [self.type,self.value]
def get_text_data_child_list(self):
"""
Returns the list of child objects that may carry textual data.
@return: Returns the list of child objects that may carry textual data.
@rtype: list
"""
check_list = self.source_list
if self.note:
check_list.append(self.note)
return check_list
def set_type(self,val):
"""sets the type (or key) of the Attribute instance"""
self.type = val
@ -2925,6 +3207,28 @@ class Address(DataObj):
self.date = Date.Date()
self.phone = ""
def get_text_data_list(self):
"""
Returns the list of all textual attributes of the object.
@return: Returns the list of all textual attributes of the object.
@rtype: list
"""
return [self.street,self.city,self.state,self.country,
self.postal,self.phone]
def get_text_data_child_list(self):
"""
Returns the list of child objects that may carry textual data.
@return: Returns the list of child objects that may carry textual data.
@rtype: list
"""
check_list = self.source_list
if self.note:
check_list.append(self.note)
return check_list
def set_date(self,date):
"""
Sets the date of the object. The date is parsed into a L{Date} instance.
@ -3057,6 +3361,28 @@ class Name(DataObj):
self.display_as = self.DEF
self.date = None
def get_text_data_list(self):
"""
Returns the list of all textual attributes of the object.
@return: Returns the list of all textual attributes of the object.
@rtype: list
"""
return [self.first_name,self.surname,self.suffix,self.title,
self.type,self.prefix,self.patronymic]
def get_text_data_child_list(self):
"""
Returns the list of child objects that may carry textual data.
@return: Returns the list of child objects that may carry textual data.
@rtype: list
"""
check_list = self.source_list
if self.note:
check_list.append(self.note)
return check_list
def set_group_as(self,name):
"""
Sets the grouping name for a person. Normally, this is the person's
@ -3361,7 +3687,7 @@ class Name(DataObj):
self.date = date
class Url:
class Url(BaseObject):
"""Contains information related to internet Uniform Resource Locators,
allowing gramps to store information about internet resources"""
@ -3376,6 +3702,15 @@ class Url:
self.desc = ""
self.private = 0
def get_text_data_list(self):
"""
Returns the list of all textual attributes of the object.
@return: Returns the list of all textual attributes of the object.
@rtype: list
"""
return [self.path,self.desc]
def set_privacy(self,val):
"""
Sets or clears the privacy flag of the data
@ -3421,7 +3756,7 @@ class Url:
return 0
return 1
class Witness:
class Witness(BaseObject):
"""
The Witness class is used to represent a person who may or may
not be in the database. If the person is in the database, the
@ -3436,6 +3771,15 @@ class Witness:
self.set_comment(comment)
self.private = False
def get_text_data_list(self):
"""
Returns the list of all textual attributes of the object.
@return: Returns the list of all textual attributes of the object.
@rtype: list
"""
return [self.val,self.comment]
def set_privacy(self,val):
"""
Sets or clears the privacy flag of the data
@ -3473,7 +3817,7 @@ class Witness:
def get_comment(self):
return self.comment
class SourceRef:
class SourceRef(BaseObject):
"""Source reference, containing detailed information about how a
referenced source relates to it"""
@ -3496,6 +3840,24 @@ class SourceRef:
self.text = ""
self.private = False
def get_text_data_list(self):
"""
Returns the list of all textual attributes of the object.
@return: Returns the list of all textual attributes of the object.
@rtype: list
"""
return [self.page,self.text]
def get_text_data_child_list(self):
"""
Returns the list of child objects that may carry textual data.
@return: Returns the list of child objects that may carry textual data.
@rtype: list
"""
return [self.comments]
def set_privacy(self,val):
"""
Sets or clears the privacy flag of the data
@ -3664,4 +4026,3 @@ class GenderStats:
return Person.FEMALE
return Person.UNKNOWN