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

* src/RelLib/_SourceRef.py (unserialize): Minor change.

Browse Source 
* src/RelLib/_Source.py: Remove note.
	* src/RelLib/_Person.py (get_text_data_child_list): Remove note.


svn: r8733
This commit is contained in:
Alex Roitman 2007-07-18 01:54:43 +00:00
parent 06fe054e31
commit 8638e1d326
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,4 +1,7 @@
2007-07-17 Alex Roitman <shura@gramps-project.org> 2007-07-17 Alex Roitman <shura@gramps-project.org>
* src/RelLib/_SourceRef.py (unserialize): Minor change.
* src/RelLib/_Source.py: Remove note.
* src/RelLib/_Person.py (get_text_data_child_list): Remove note.
* data/grampsxml.dtd: Add missing datespan for lds and sourceref. * data/grampsxml.dtd: Add missing datespan for lds and sourceref.
* data/grampsxml.rng: Add privacy to reporef. * data/grampsxml.rng: Add privacy to reporef.
* data/grampsxml.dtd: Add privacy to reporef. * data/grampsxml.dtd: Add privacy to reporef.

2
src/RelLib/_Person.py
View File

@ -295,7 +295,7 @@ class Person(SourceBase, NoteBase, AttributeBase, MediaBase,
@return: 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 @rtype: list
""" """
check_list = self.lds_ord_list + [self.note] check_list = self.lds_ord_list
add_list = [item for item in check_list if item] add_list = [item for item in check_list if item]
return [self.primary_name] + self.media_list + \ return [self.primary_name] + self.media_list + \
self.alternate_names + self.address_list + \ self.alternate_names + self.address_list + \

2
src/RelLib/_Source.py
View File

@ -34,7 +34,6 @@ __revision__ = "$Revision$"
from _PrimaryObject import PrimaryObject from _PrimaryObject import PrimaryObject
from _MediaBase import MediaBase from _MediaBase import MediaBase
from _NoteBase import NoteBase from _NoteBase import NoteBase
from _Note import Note
from _RepoRef import RepoRef from _RepoRef import RepoRef
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -53,7 +52,6 @@ class Source(MediaBase, NoteBase, PrimaryObject):
self.title = "" self.title = ""
self.author = "" self.author = ""
self.pubinfo = "" self.pubinfo = ""
self.note = Note()
self.datamap = {} self.datamap = {}
self.abbrev = "" self.abbrev = ""
self.reporef_list = [] self.reporef_list = []

4
src/RelLib/_SourceRef.py
View File

@ -83,11 +83,11 @@ class SourceRef(SecondaryObject, DateBase, PrivacyBase, NoteBase, RefBase):
""" """
Converts a serialized tuple of data to an object Converts a serialized tuple of data to an object
""" """
(date, privacy, note, (date, privacy, note_list,
self.confidence, ref, self.page) = data self.confidence, ref, self.page) = data
DateBase.unserialize(self, date) DateBase.unserialize(self, date)
PrivacyBase.unserialize(self, privacy) PrivacyBase.unserialize(self, privacy)
NoteBase.unserialize(self, note) NoteBase.unserialize(self, note_list)
RefBase.unserialize(self, ref) RefBase.unserialize(self, ref)
return self return self