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

* src/RelLib.py (Witness): Remove class, as it is obsoleted by the

Browse Source 
EventRef class.


svn: r4744
This commit is contained in:
Alex Roitman 2005-05-31 18:34:14 +00:00
parent 44c3dcf88e
commit 476fdeafb7
2 changed files with 6 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gramps2/ChangeLog
View File

@ -1,6 +1,8 @@
2005-05-31 Alex Roitman <shura@gramps-project.org> 2005-05-31 Alex Roitman <shura@gramps-project.org>
* src/AutoComp.py (StandardCustomSelector): Add class to handle * src/AutoComp.py (StandardCustomSelector): Add class to handle
(int,str) selections including custom strings. (int,str) selections including custom strings.
* src/RelLib.py (Witness): Remove class, as it is obsoleted by the
EventRef class.
2005-05-30 Alex Roitman <shura@gramps-project.org> 2005-05-30 Alex Roitman <shura@gramps-project.org>
* src/RelLib.py: Move constants back to RelLib, as class attributes. * src/RelLib.py: Move constants back to RelLib, as class attributes.

63
gramps2/src/RelLib.py
View File

@ -2343,12 +2343,12 @@ class Event(PrimaryObject,PrivateSourceNote,MediaBase,DateBase,PlaceBase):
if other == None: if other == None:
other = Event (None) other = Event (None)
if self.type[0] != other.type[0] or \ if self.type[0] != other.type[0] or \
self.type[0] == Event.CUSTOM and self.type[1] != other.type[1]) or \ (self.type[0] == Event.CUSTOM and self.type[1] != other.type[1]) or \
((self.place or other.place) and (self.place != other.place)) or \ ((self.place or other.place) and (self.place != other.place)) or \
self.description != other.description or self.cause != other.cause \ self.description != other.description or self.cause != other.cause \
or self.private != other.private or or self.private != other.private or \
(not self.get_date_object().is_equal(other.get_date_object())) or (not self.get_date_object().is_equal(other.get_date_object())) or \
len(self.get_source_references()) != len(other.get_source_references())): len(self.get_source_references()) != len(other.get_source_references()):
return False return False
index = 0 index = 0
@ -4024,61 +4024,6 @@ class Url(BaseObject,PrivacyBase):
return 0 return 0
return 1 return 1
class Witness(BaseObject,PrivacyBase):
"""
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
type will be Event.ID, and the value with be the database handle
for the person. If the person is not in the database, the type
will be Event.NAME, and the value will be a string representing
the person's name.
"""
def __init__(self,type=Event.NAME,val="",comment=""):
PrivacyBase.__init__(self)
self.set_type(type)
self.set_value(val)
self.set_comment(comment)
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 get_referenced_handles(self):
"""
Returns the list of (classname,handle) tuples for all directly
referenced primary objects.
@return: Returns the list of (classname,handle) tuples for referenced objects.
@rtype: list
"""
if self.type == Event.ID:
return [('Person',self.val)]
else:
return []
def set_type(self,type):
self.type = type
def get_type(self):
return self.type
def set_value(self,val):
self.val = val
def get_value(self):
return self.val
def set_comment(self,comment):
self.comment = comment
def get_comment(self):
return self.comment
class SourceRef(BaseObject,DateBase,PrivacyBase,NoteBase): class SourceRef(BaseObject,DateBase,PrivacyBase,NoteBase):
"""Source reference, containing detailed information about how a """Source reference, containing detailed information about how a
referenced source relates to it""" referenced source relates to it"""