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

* data/grampsxml.dtd: Update.

Browse Source 
* data/grampsxml.rng: Update.


svn: r6366
This commit is contained in:
Alex Roitman
2006-04-19 05:14:37 +00:00
parent f6d8887f35
commit ca5e698290
5 changed files with 45 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/GrampsDb/_ReadXML.py
View File

@@ -956,14 +956,13 @@ class GrampsParser:
mrel = RelLib.ChildRefType().set_from_xml_str(attrs.get('mrel'))
frel = RelLib.ChildRefType().set_from_xml_str(attrs.get('frel'))
# Only need to worry about this if there are non-default rels
# Otherwise, if both are default, the family's child tag will do
if not ( mrel.is_default() and frel.is_default() ):
childref = RelLib.ChildRef()
childref.ref = self.person.handle
childref = RelLib.ChildRef()
childref.ref = self.person.handle
if not mrel.is_default():
childref.set_mother_relation(mrel)
if not frel.is_default():
childref.set_father_relation(frel)
self.childref_map[(handle,self.person.handle)] = childref
self.childref_map[(handle,self.person.handle)] = childref
self.person.add_parent_family_handle(handle)
def start_parentin(self,attrs):
@@ -979,8 +978,6 @@ class GrampsParser:
if not self.in_witness:
self.name = RelLib.Name()
self.name.type.set_from_xml_str(attrs.get('type'))
## (_ConstXML.tuple_from_xml(
## _ConstXML.name_types,attrs.get('type','Birth Name')))
self.name.sort_as = int(attrs.get("sort",RelLib.Name.DEF))
self.name.display_as = int(attrs.get("display",RelLib.Name.DEF))
self.name.conf = int(attrs.get("conf",2))

10
src/GrampsDb/_WriteXML.py
View File

@@ -535,10 +535,10 @@ class XmlWriter:
sreflist = childref.get_source_references()
if (len(sreflist) == 0) and childref.get_note() =="":
self.write_ref('childref',childref.ref,index,close=True,
extra_text=priv_text+frel_text+mrel_text)
extra_text=priv_text+mrel_text+frel_text)
else:
self.write_ref('childref',childref.ref,index,close=False,
extra_text=priv_text+frel_text+mrel_text)
extra_text=priv_text+mrel_text+frel_text)
for sref in sreflist:
self.dump_source_ref(sref,index+1)
self.write_note("note",childref.get_note_object(),index+1)
@@ -759,8 +759,7 @@ class XmlWriter:
def dump_name(self,name,alternative=False,index=1):
sp = " "*index
name_type = _ConstXML.str_for_xml(_ConstXML.name_types,
name.get_type())
name_type = name.get_type().xml_str()
self.g.write('%s<name' % sp)
if alternative:
self.g.write(' alt="1"')
@@ -923,8 +922,7 @@ class XmlWriter:
def write_url_list(self,list,index=1):
sp = " "*index
for url in list:
url_type = _ConstXML.str_for_xml(_ConstXML.url_types,
url.get_type())
url_type = url.get_type().xml_str()
if url_type:
type_text = ' type="%s"' % url_type
else: