* src/GrampsDb/_GrampsBSDDB.py: Typos.

* src/GrampsDb/_WriteXML.py: Minor corrections.
* doc/grampsxml.rng: Updates.
* example/gramps/example.gramps: New XML example.


svn: r5847
This commit is contained in:
Alex Roitman 2006-01-28 04:23:37 +00:00
parent 6104ff1053
commit 52ba278ea1
5 changed files with 24422 additions and 15997 deletions

View File

@ -9,6 +9,11 @@
* src/GrampsDb/_WriteXML.py: More XML updates. * src/GrampsDb/_WriteXML.py: More XML updates.
* doc/grampsxml.rng: Update to reflect new XML. * doc/grampsxml.rng: Update to reflect new XML.
* src/GrampsDb/_GrampsBSDDB.py: Typos.
* src/GrampsDb/_WriteXML.py: Minor corrections.
* doc/grampsxml.rng: Updates.
* example/gramps/example.gramps: New XML example.
2006-01-27 Don Allingham <don@gramps-project.org> 2006-01-27 Don Allingham <don@gramps-project.org>
* src/GrampsDb/_ReadGedcomp.py: preselect gramps ids for events * src/GrampsDb/_ReadGedcomp.py: preselect gramps ids for events

View File

@ -395,7 +395,7 @@
<define name="repository-content"> <define name="repository-content">
<ref name="primary-object"/> <ref name="primary-object"/>
<optional><element name="name"><text/></element></optional> <optional><element name="rname"><text/></element></optional>
<optional><element name="type"><text/></element></optional> <optional><element name="type"><text/></element></optional>
<zeroOrMore><element name="address"> <zeroOrMore><element name="address">
<ref name="address-content"/> <ref name="address-content"/>

File diff suppressed because it is too large Load Diff

View File

@ -1584,9 +1584,9 @@ class GrampsBSDDB(GrampsDbBase):
# data = cursor.next() # data = cursor.next()
# cursor.close() # cursor.close()
self.transaction_commit(trans,"Upgrade to DB version 9") self.transaction_commit(trans,"Upgrade to DB version 9")
# Close secodnary index # Close secodnary index
self.reference_map_primary_map.close() self.reference_map_primary_map.close()
self.metadata.put('version',9) self.metadata.put('version',9)
self.metadata.sync() self.metadata.sync()
print "Done upgrading to DB version 9" print "Done upgrading to DB version 9"

View File

@ -471,15 +471,13 @@ class XmlWriter:
if source.get_note() != "": if source.get_note() != "":
self.write_note("note",source.get_note_object(),index+1) self.write_note("note",source.get_note_object(),index+1)
self.write_media_list(source.get_media_list(),index+1) self.write_media_list(source.get_media_list(),index+1)
self.write_reporef_list(source.get_reporef_list(),index+1)
self.write_data_map(source.get_data_map()) self.write_data_map(source.get_data_map())
self.write_reporef_list(source.get_reporef_list(),index+1)
self.g.write("%s</source>\n" % sp) self.g.write("%s</source>\n" % sp)
def write_repository(self,repo,index=1): def write_repository(self,repo,index=1):
sp = " "*index sp = " "*index
self.write_primary_tag("repository",repo,index) self.write_primary_tag("repository",repo,index)
if repo.get_note() != "":
self.write_note("note",repo.get_note_object(),index+1)
#name #name
self.write_line('rname',repo.name,index+1) self.write_line('rname',repo.name,index+1)
rtype = _ConstXML.str_for_xml(_ConstXML.repository_types,repo.type) rtype = _ConstXML.str_for_xml(_ConstXML.repository_types,repo.type)
@ -489,6 +487,8 @@ class XmlWriter:
self.write_address_list(repo,index+1) self.write_address_list(repo,index+1)
# url list # url list
self.write_url_list(repo.get_url_list(),index+1) self.write_url_list(repo.get_url_list(),index+1)
if repo.get_note() != "":
self.write_note("note",repo.get_note_object(),index+1)
self.g.write("%s</repository>\n" % sp) self.g.write("%s</repository>\n" % sp)
def write_address_list(self,obj,index=1): def write_address_list(self,obj,index=1):
@ -856,7 +856,7 @@ class XmlWriter:
sp = ' '*indent sp = ' '*indent
for key in datamap.keys(): for key in datamap.keys():
self.g.write('%s<data_item key="%s" value="%s"/>' % self.g.write('%s<data_item key="%s" value="%s"/>\n' %
(sp,key,datamap[key])) (sp,key,datamap[key]))
def write_reporef_list(self,rrlist,index=1): def write_reporef_list(self,rrlist,index=1):