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

8683: fix duplicate <name> element on pre-1.7.0 XML version

Browse Source 
XML: use <pname> tag into place hierarchy instead of duplicate <name>
This commit is contained in:
Jérôme Rapinat 2015-07-05 11:09:19 +02:00
parent 223d41a99d
commit 444c8f95e1
6 changed files with 1347 additions and 1347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
data/grampsxml.dtd
View File

@ -248,7 +248,7 @@ PLACES
<!ELEMENT places (placeobj)*> <!ELEMENT places (placeobj)*>
<!ELEMENT placeobj (ptitle?, name+, code?, coord?, placeref*, location*, <!ELEMENT placeobj (ptitle?, pname+, code?, coord?, placeref*, location*,
objref*, url*, noteref*, citationref*, tagref*)> objref*, url*, noteref*, citationref*, tagref*)>
<!ATTLIST placeobj <!ATTLIST placeobj
id CDATA #IMPLIED id CDATA #IMPLIED
@ -258,10 +258,9 @@ PLACES
type CDATA #REQUIRED type CDATA #REQUIRED
> >
<!ELEMENT pname (daterange|datespan|dateval|datestr)?>
<!ELEMENT name (daterange|datespan|dateval|datestr)?> <!ATTLIST pname
<!ATTLIST name
lang CDATA #IMPLIED lang CDATA #IMPLIED
value CDATA #REQUIRED value CDATA #REQUIRED
> >

2
data/grampsxml.rng
View File

@ -481,7 +481,7 @@
<ref name="primary-object"/> <ref name="primary-object"/>
<attribute name="type"><text/></attribute> <attribute name="type"><text/></attribute>
<optional><element name="ptitle"><text/></element></optional> <optional><element name="ptitle"><text/></element></optional>
<oneOrMore><element name="name"> <oneOrMore><element name="pname">
<ref name="placename-content"/> <ref name="placename-content"/>
</element></oneOrMore> </element></oneOrMore>
<optional><element name="code"><text/></element></optional> <optional><element name="code"><text/></element></optional>

92
example/gramps/data.gramps
View File

@ -3,7 +3,7 @@
"http://gramps-project.org/xml/1.7.0/grampsxml.dtd"> "http://gramps-project.org/xml/1.7.0/grampsxml.dtd">
<database xmlns="http://gramps-project.org/xml/1.7.0/"> <database xmlns="http://gramps-project.org/xml/1.7.0/">
<header> <header>
<created date="2015-06-27" version="4.2.0"/> <created date="2015-07-04" version="4.2.0"/>
<researcher> <researcher>
<resname>Alex Roitman,,,</resname> <resname>Alex Roitman,,,</resname>
</researcher> </researcher>
@ -1525,215 +1525,215 @@
<places> <places>
<placeobj handle="_4ZLT6DVCWT9LTZRDCS" change="1422124381" id="P0003" type="City"> <placeobj handle="_4ZLT6DVCWT9LTZRDCS" change="1422124381" id="P0003" type="City">
<ptitle>Ronne, Bornholm, Denmark</ptitle> <ptitle>Ronne, Bornholm, Denmark</ptitle>
<name value="Ronne"/> <pname value="Ronne"/>
<placeref hlink="_cef2428d9dd233688ea3ed3cc24"/> <placeref hlink="_cef2428d9dd233688ea3ed3cc24"/>
</placeobj> </placeobj>
<placeobj handle="_61NT6D3G1JMOTO6Z7Y" change="1422123855" id="P0012" type="Municipality"> <placeobj handle="_61NT6D3G1JMOTO6Z7Y" change="1422123855" id="P0012" type="Municipality">
<ptitle>Grostorp, Kristianstad Lan, Sweden</ptitle> <ptitle>Grostorp, Kristianstad Lan, Sweden</ptitle>
<name value="Grostorp"/> <pname value="Grostorp"/>
<placeref hlink="_cef23a81ba8c837cc364895d88"/> <placeref hlink="_cef23a81ba8c837cc364895d88"/>
</placeobj> </placeobj>
<placeobj handle="_67MT6DB6KWOVMBAXSY" change="1422125128" id="P0002" type="City"> <placeobj handle="_67MT6DB6KWOVMBAXSY" change="1422125128" id="P0002" type="City">
<ptitle>San Francisco, San Francisco Co., CA, USA</ptitle> <ptitle>San Francisco, San Francisco Co., CA, USA</ptitle>
<name value="San Francisco"/> <pname value="San Francisco"/>
<placeref hlink="_cef24668db23c27d421f51c667d"/> <placeref hlink="_cef24668db23c27d421f51c667d"/>
</placeobj> </placeobj>
<placeobj handle="_7JMT6DN2LOF54KXHTU" change="1422125958" id="P0010" type="City"> <placeobj handle="_7JMT6DN2LOF54KXHTU" change="1422125958" id="P0010" type="City">
<ptitle>Reno, Washoe Co., NV, USA</ptitle> <ptitle>Reno, Washoe Co., NV, USA</ptitle>
<name value="Reno"/> <pname value="Reno"/>
<placeref hlink="_cef2513e057732c3f27780750d"/> <placeref hlink="_cef2513e057732c3f27780750d"/>
</placeobj> </placeobj>
<placeobj handle="_A9MT6DHVWGWRP59DEV" change="1422123595" id="P0011" type="Country"> <placeobj handle="_A9MT6DHVWGWRP59DEV" change="1422123595" id="P0011" type="Country">
<ptitle>Sweden</ptitle> <ptitle>Sweden</ptitle>
<name value="Sweden"/> <pname value="Sweden"/>
</placeobj> </placeobj>
<placeobj handle="_AANT6D026O5SHNUCDH" change="1422123942" id="P0015" type="Municipality"> <placeobj handle="_AANT6D026O5SHNUCDH" change="1422123942" id="P0015" type="Municipality">
<ptitle>Simrishamn, Kristianstad Lan, Sweden</ptitle> <ptitle>Simrishamn, Kristianstad Lan, Sweden</ptitle>
<name value="Simrishamn"/> <pname value="Simrishamn"/>
<placeref hlink="_cef23a81ba8c837cc364895d88"/> <placeref hlink="_cef23a81ba8c837cc364895d88"/>
</placeobj> </placeobj>
<placeobj handle="_AKMT6DMEYZDTG9J6DS" change="1422124249" id="P0013" type="City"> <placeobj handle="_AKMT6DMEYZDTG9J6DS" change="1422124249" id="P0013" type="City">
<ptitle>Copenhagen, Denmark</ptitle> <ptitle>Copenhagen, Denmark</ptitle>
<name value="Copenhagen"/> <pname value="Copenhagen"/>
<placeref hlink="_cef2418f9333e16e00f6ce2eb14"/> <placeref hlink="_cef2418f9333e16e00f6ce2eb14"/>
</placeobj> </placeobj>
<placeobj handle="_BAOT6D1WY6J4O4ARRN" change="1422125198" id="P0030" type="City"> <placeobj handle="_BAOT6D1WY6J4O4ARRN" change="1422125198" id="P0030" type="City">
<ptitle>San Ramon, Conta Costa Co., CA, USA</ptitle> <ptitle>San Ramon, Conta Costa Co., CA, USA</ptitle>
<name value="San Ramon"/> <pname value="San Ramon"/>
<placeref hlink="_cef2478a94b48a58d3be6a10493"/> <placeref hlink="_cef2478a94b48a58d3be6a10493"/>
</placeobj> </placeobj>
<placeobj handle="_DYLT6DF4DX2MNZICJ8" change="1422126222" id="P0014" type="City"> <placeobj handle="_DYLT6DF4DX2MNZICJ8" change="1422126222" id="P0014" type="City">
<ptitle>Hoya, Sweden</ptitle> <ptitle>Hoya, Sweden</ptitle>
<name value="Hoya"/> <pname value="Hoya"/>
<name value="Jona"/> <pname value="Jona"/>
<name value="Hoia"/> <pname value="Hoia"/>
<placeref hlink="_A9MT6DHVWGWRP59DEV"/> <placeref hlink="_A9MT6DHVWGWRP59DEV"/>
</placeobj> </placeobj>
<placeobj handle="_ELNT6DS8GN8WI7Z4SO" change="1422125073" id="P0008" type="City"> <placeobj handle="_ELNT6DS8GN8WI7Z4SO" change="1422125073" id="P0008" type="City">
<ptitle>Hayward, Alameda Co., CA, USA</ptitle> <ptitle>Hayward, Alameda Co., CA, USA</ptitle>
<name value="Hayward"/> <pname value="Hayward"/>
<placeref hlink="_cef245b044820b7405a1180f298"/> <placeref hlink="_cef245b044820b7405a1180f298"/>
</placeobj> </placeobj>
<placeobj handle="_FBNT6DL92NDY0Z5SGP" change="1422125294" id="P0021" type="City"> <placeobj handle="_FBNT6DL92NDY0Z5SGP" change="1422125294" id="P0021" type="City">
<ptitle>Santa Rosa, Sonoma Co., CA, USA</ptitle> <ptitle>Santa Rosa, Sonoma Co., CA, USA</ptitle>
<name value="Santa Rosa"/> <pname value="Santa Rosa"/>
<placeref hlink="_cef24b7a76efa8b9d98d67ea5a"/> <placeref hlink="_cef24b7a76efa8b9d98d67ea5a"/>
</placeobj> </placeobj>
<placeobj handle="_GWNT6D12ZV06PK969X" change="1422125101" id="P0020" type="City"> <placeobj handle="_GWNT6D12ZV06PK969X" change="1422125101" id="P0020" type="City">
<ptitle>Sacramento, Sacramento Co., CA, USA</ptitle> <ptitle>Sacramento, Sacramento Co., CA, USA</ptitle>
<name value="Sacramento"/> <pname value="Sacramento"/>
<placeref hlink="_cef246117947f75e54c09680419"/> <placeref hlink="_cef246117947f75e54c09680419"/>
</placeobj> </placeobj>
<placeobj handle="_HFNT6D12ZC0KOWY69T" change="1422125018" id="P0016" type="City"> <placeobj handle="_HFNT6D12ZC0KOWY69T" change="1422125018" id="P0016" type="City">
<ptitle>Fremont, Alameda Co., CA, USA</ptitle> <ptitle>Fremont, Alameda Co., CA, USA</ptitle>
<name value="Fremont"/> <pname value="Fremont"/>
<placeref hlink="_cef245b044820b7405a1180f298"/> <placeref hlink="_cef245b044820b7405a1180f298"/>
</placeobj> </placeobj>
<placeobj handle="_HINT6DP8JGGL0KKB8J" change="1422123879" id="P0000" type="Municipality"> <placeobj handle="_HINT6DP8JGGL0KKB8J" change="1422123879" id="P0000" type="Municipality">
<ptitle>Loderup, Malmous Lan, Sweden</ptitle> <ptitle>Loderup, Malmous Lan, Sweden</ptitle>
<name value="Loderup"/> <pname value="Loderup"/>
<placeref hlink="_cef23c1ee8b7da58c764e88c637"/> <placeref hlink="_cef23c1ee8b7da58c764e88c637"/>
</placeobj> </placeobj>
<placeobj handle="_IEOT6DOW3RE8AQ94HH" change="1422126043" id="P0025" type="Unknown"> <placeobj handle="_IEOT6DOW3RE8AQ94HH" change="1422126043" id="P0025" type="Unknown">
<ptitle>Bí</ptitle> <ptitle>Bí</ptitle>
<name value="Bí"/> <pname value="Bí"/>
</placeobj> </placeobj>
<placeobj handle="_LTNT6DKZ5CR8PZSVUS" change="1422125169" id="P0022" type="City"> <placeobj handle="_LTNT6DKZ5CR8PZSVUS" change="1422125169" id="P0022" type="City">
<ptitle>San Jose, Santa Clara Co., CA, USA</ptitle> <ptitle>San Jose, Santa Clara Co., CA, USA</ptitle>
<name value="San Jose"/> <pname value="San Jose"/>
<placeref hlink="_cef246c95c132bcf6a0255d4d17"/> <placeref hlink="_cef246c95c132bcf6a0255d4d17"/>
</placeobj> </placeobj>
<placeobj handle="_PUNT6D1XHS0DJW9QP6" change="1422125605" id="P0024" type="University"> <placeobj handle="_PUNT6D1XHS0DJW9QP6" change="1422125605" id="P0024" type="University">
<ptitle>UC Berkeley, CA, USA</ptitle> <ptitle>UC Berkeley, CA, USA</ptitle>
<name value="UC Berkeley"/> <pname value="UC Berkeley"/>
<placeref hlink="_cef243fb5634559442323368f63"/> <placeref hlink="_cef243fb5634559442323368f63"/>
</placeobj> </placeobj>
<placeobj handle="_PXMT6DBL0WSBL76WD7" change="1422123936" id="P0026" type="Municipality"> <placeobj handle="_PXMT6DBL0WSBL76WD7" change="1422123936" id="P0026" type="Municipality">
<ptitle>Smestorp, Kristianstad Lan, Sweden</ptitle> <ptitle>Smestorp, Kristianstad Lan, Sweden</ptitle>
<name value="Smestorp"/> <pname value="Smestorp"/>
<placeref hlink="_cef23a81ba8c837cc364895d88"/> <placeref hlink="_cef23a81ba8c837cc364895d88"/>
</placeobj> </placeobj>
<placeobj handle="_QBOT6DN7UCCTZQ055" change="1422125399" id="P0029" type="City"> <placeobj handle="_QBOT6DN7UCCTZQ055" change="1422125399" id="P0029" type="City">
<ptitle>Woodland, Yolo Co., CA, USA</ptitle> <ptitle>Woodland, Yolo Co., CA, USA</ptitle>
<name value="Woodland"/> <pname value="Woodland"/>
<placeref hlink="_cef24c2e3592e759b7797f95465"/> <placeref hlink="_cef24c2e3592e759b7797f95465"/>
</placeobj> </placeobj>
<placeobj handle="_QJMT6DGII29FWCPX2E" change="1422124361" id="P0028" type="City"> <placeobj handle="_QJMT6DGII29FWCPX2E" change="1422124361" id="P0028" type="City">
<ptitle>Ronne Bornholm, Denmark</ptitle> <ptitle>Ronne Bornholm, Denmark</ptitle>
<name value="Ronne Bornholm"/> <pname value="Ronne Bornholm"/>
<placeref hlink="_cef2418f9333e16e00f6ce2eb14"/> <placeref hlink="_cef2418f9333e16e00f6ce2eb14"/>
</placeobj> </placeobj>
<placeobj handle="_R8MT6DRIZVNRYDK0VN" change="1422123930" id="P0027" type="Municipality"> <placeobj handle="_R8MT6DRIZVNRYDK0VN" change="1422123930" id="P0027" type="Municipality">
<ptitle>Tommarp, Kristianstad Lan, Sweden</ptitle> <ptitle>Tommarp, Kristianstad Lan, Sweden</ptitle>
<name value="Tommarp"/> <pname value="Tommarp"/>
<placeref hlink="_cef23a81ba8c837cc364895d88"/> <placeref hlink="_cef23a81ba8c837cc364895d88"/>
</placeobj> </placeobj>
<placeobj handle="_RPMT6DTQR8J7LK98HJ" change="1422125771" id="P0019" type="City"> <placeobj handle="_RPMT6DTQR8J7LK98HJ" change="1422125771" id="P0019" type="City">
<ptitle>Denver, Denver Co., CO, USA</ptitle> <ptitle>Denver, Denver Co., CO, USA</ptitle>
<name value="Denver"/> <pname value="Denver"/>
<placeref hlink="_cef24ffc57f28a50ea65f0af645"/> <placeref hlink="_cef24ffc57f28a50ea65f0af645"/>
</placeobj> </placeobj>
<placeobj handle="_S1NT6DPOBYC1JGMR1P" change="1422125992" id="P0001" type="City"> <placeobj handle="_S1NT6DPOBYC1JGMR1P" change="1422125992" id="P0001" type="City">
<ptitle>Sparks, Washoe Co., NV, USA</ptitle> <ptitle>Sparks, Washoe Co., NV, USA</ptitle>
<name value="Sparks"/> <pname value="Sparks"/>
<placeref hlink="_cef2513e057732c3f27780750d"/> <placeref hlink="_cef2513e057732c3f27780750d"/>
</placeobj> </placeobj>
<placeobj handle="_XLNT6DUONITFPPEGVH" change="1422125508" id="P0009" type="Church"> <placeobj handle="_XLNT6DUONITFPPEGVH" change="1422125508" id="P0009" type="Church">
<ptitle>Community Presbyterian Church, Danville, CA, USA</ptitle> <ptitle>Community Presbyterian Church, Danville, CA, USA</ptitle>
<name value="Community Presbyterian Church"/> <pname value="Community Presbyterian Church"/>
<placeref hlink="_cef24d930653dc59ec3a36510e4"/> <placeref hlink="_cef24d930653dc59ec3a36510e4"/>
</placeobj> </placeobj>
<placeobj handle="_XSMT6DNISHYRCR1E78" change="1422123836" id="P0004" type="Municipality"> <placeobj handle="_XSMT6DNISHYRCR1E78" change="1422123836" id="P0004" type="Municipality">
<ptitle>Gladsax, Kristianstad Lan, Sweden</ptitle> <ptitle>Gladsax, Kristianstad Lan, Sweden</ptitle>
<name value="Gladsax"/> <pname value="Gladsax"/>
<placeref hlink="_cef23a81ba8c837cc364895d88"/> <placeref hlink="_cef23a81ba8c837cc364895d88"/>
</placeobj> </placeobj>
<placeobj handle="_cef23a81ba8c837cc364895d88" change="1422123677" id="P0005" type="County"> <placeobj handle="_cef23a81ba8c837cc364895d88" change="1422123677" id="P0005" type="County">
<ptitle>Kristianstad Lan, Sweden</ptitle> <ptitle>Kristianstad Lan, Sweden</ptitle>
<name value="Kristianstad Lan"/> <pname value="Kristianstad Lan"/>
<placeref hlink="_A9MT6DHVWGWRP59DEV"/> <placeref hlink="_A9MT6DHVWGWRP59DEV"/>
</placeobj> </placeobj>
<placeobj handle="_cef23c1ee8b7da58c764e88c637" change="1422123662" id="P0006" type="County"> <placeobj handle="_cef23c1ee8b7da58c764e88c637" change="1422123662" id="P0006" type="County">
<ptitle>Malmous Lan, Sweden</ptitle> <ptitle>Malmous Lan, Sweden</ptitle>
<name value="Malmous Lan"/> <pname value="Malmous Lan"/>
<placeref hlink="_A9MT6DHVWGWRP59DEV"/> <placeref hlink="_A9MT6DHVWGWRP59DEV"/>
</placeobj> </placeobj>
<placeobj handle="_cef2418f9333e16e00f6ce2eb14" change="1422124233" id="P0007" type="Country"> <placeobj handle="_cef2418f9333e16e00f6ce2eb14" change="1422124233" id="P0007" type="Country">
<ptitle>Denmark</ptitle> <ptitle>Denmark</ptitle>
<name value="Denmark"/> <pname value="Denmark"/>
</placeobj> </placeobj>
<placeobj handle="_cef2428d9dd233688ea3ed3cc24" change="1422124337" id="P0017" type="Region"> <placeobj handle="_cef2428d9dd233688ea3ed3cc24" change="1422124337" id="P0017" type="Region">
<ptitle>Bornholm, Denmark</ptitle> <ptitle>Bornholm, Denmark</ptitle>
<name value="Bornholm"/> <pname value="Bornholm"/>
<placeref hlink="_cef2418f9333e16e00f6ce2eb14"/> <placeref hlink="_cef2418f9333e16e00f6ce2eb14"/>
</placeobj> </placeobj>
<placeobj handle="_cef2438892244290ca7fb5750" change="1422124440" id="P0018" type="Country"> <placeobj handle="_cef2438892244290ca7fb5750" change="1422124440" id="P0018" type="Country">
<ptitle>USA</ptitle> <ptitle>USA</ptitle>
<name value="USA"/> <pname value="USA"/>
</placeobj> </placeobj>
<placeobj handle="_cef243fb5634559442323368f63" change="1422124487" id="P0023" type="State"> <placeobj handle="_cef243fb5634559442323368f63" change="1422124487" id="P0023" type="State">
<ptitle>CA, USA</ptitle> <ptitle>CA, USA</ptitle>
<name value="CA"/> <pname value="CA"/>
<placeref hlink="_cef2438892244290ca7fb5750"/> <placeref hlink="_cef2438892244290ca7fb5750"/>
</placeobj> </placeobj>
<placeobj handle="_cef244224d14af0273799b281e" change="1422124514" id="P0031" type="State"> <placeobj handle="_cef244224d14af0273799b281e" change="1422124514" id="P0031" type="State">
<ptitle>CO, USA</ptitle> <ptitle>CO, USA</ptitle>
<name value="CO"/> <pname value="CO"/>
<placeref hlink="_cef2438892244290ca7fb5750"/> <placeref hlink="_cef2438892244290ca7fb5750"/>
</placeobj> </placeobj>
<placeobj handle="_cef24468f6e3a984bf57967e95d" change="1422124542" id="P0032" type="State"> <placeobj handle="_cef24468f6e3a984bf57967e95d" change="1422124542" id="P0032" type="State">
<ptitle>NV, USA</ptitle> <ptitle>NV, USA</ptitle>
<name value="NV"/> <pname value="NV"/>
<placeref hlink="_cef2438892244290ca7fb5750"/> <placeref hlink="_cef2438892244290ca7fb5750"/>
</placeobj> </placeobj>
<placeobj handle="_cef245b044820b7405a1180f298" change="1422124666" id="P0033" type="County"> <placeobj handle="_cef245b044820b7405a1180f298" change="1422124666" id="P0033" type="County">
<ptitle>Alameda Co., CA, USA</ptitle> <ptitle>Alameda Co., CA, USA</ptitle>
<name value="Alameda Co."/> <pname value="Alameda Co."/>
<placeref hlink="_cef243fb5634559442323368f63"/> <placeref hlink="_cef243fb5634559442323368f63"/>
</placeobj> </placeobj>
<placeobj handle="_cef246117947f75e54c09680419" change="1422124908" id="P0034" type="County"> <placeobj handle="_cef246117947f75e54c09680419" change="1422124908" id="P0034" type="County">
<ptitle>Sacramento Co., CA, USA</ptitle> <ptitle>Sacramento Co., CA, USA</ptitle>
<name value="Sacramento Co."/> <pname value="Sacramento Co."/>
<placeref hlink="_cef243fb5634559442323368f63"/> <placeref hlink="_cef243fb5634559442323368f63"/>
</placeobj> </placeobj>
<placeobj handle="_cef24668db23c27d421f51c667d" change="1422124741" id="P0035" type="County"> <placeobj handle="_cef24668db23c27d421f51c667d" change="1422124741" id="P0035" type="County">
<ptitle>San Francisco Co., CA, USA</ptitle> <ptitle>San Francisco Co., CA, USA</ptitle>
<name value="San Francisco Co."/> <pname value="San Francisco Co."/>
<placeref hlink="_cef243fb5634559442323368f63"/> <placeref hlink="_cef243fb5634559442323368f63"/>
</placeobj> </placeobj>
<placeobj handle="_cef246c95c132bcf6a0255d4d17" change="1422124781" id="P0036" type="County"> <placeobj handle="_cef246c95c132bcf6a0255d4d17" change="1422124781" id="P0036" type="County">
<ptitle>Santa Clara Co., CA, USA</ptitle> <ptitle>Santa Clara Co., CA, USA</ptitle>
<name value="Santa Clara Co."/> <pname value="Santa Clara Co."/>
<placeref hlink="_cef243fb5634559442323368f63"/> <placeref hlink="_cef243fb5634559442323368f63"/>
</placeobj> </placeobj>
<placeobj handle="_cef2478a94b48a58d3be6a10493" change="1422124860" id="P0037" type="County"> <placeobj handle="_cef2478a94b48a58d3be6a10493" change="1422124860" id="P0037" type="County">
<ptitle>Conta Costa Co., CA, USA</ptitle> <ptitle>Conta Costa Co., CA, USA</ptitle>
<name value="Conta Costa Co."/> <pname value="Conta Costa Co."/>
<placeref hlink="_cef243fb5634559442323368f63"/> <placeref hlink="_cef243fb5634559442323368f63"/>
</placeobj> </placeobj>
<placeobj handle="_cef24b7a76efa8b9d98d67ea5a" change="1422125273" id="P0038" type="County"> <placeobj handle="_cef24b7a76efa8b9d98d67ea5a" change="1422125273" id="P0038" type="County">
<ptitle>Sonoma Co., CA, USA</ptitle> <ptitle>Sonoma Co., CA, USA</ptitle>
<name value="Sonoma Co."/> <pname value="Sonoma Co."/>
<placeref hlink="_cef243fb5634559442323368f63"/> <placeref hlink="_cef243fb5634559442323368f63"/>
</placeobj> </placeobj>
<placeobj handle="_cef24c2e3592e759b7797f95465" change="1422125420" id="P0039" type="County"> <placeobj handle="_cef24c2e3592e759b7797f95465" change="1422125420" id="P0039" type="County">
<ptitle>Yolo Co., CA, USA</ptitle> <ptitle>Yolo Co., CA, USA</ptitle>
<name value="Yolo Co."/> <pname value="Yolo Co."/>
<placeref hlink="_cef243fb5634559442323368f63"/> <placeref hlink="_cef243fb5634559442323368f63"/>
</placeobj> </placeobj>
<placeobj handle="_cef24d930653dc59ec3a36510e4" change="1422125493" id="P0040" type="City"> <placeobj handle="_cef24d930653dc59ec3a36510e4" change="1422125493" id="P0040" type="City">
<ptitle>Danville, CA, USA</ptitle> <ptitle>Danville, CA, USA</ptitle>
<name value="Danville"/> <pname value="Danville"/>
<placeref hlink="_cef243fb5634559442323368f63"/> <placeref hlink="_cef243fb5634559442323368f63"/>
</placeobj> </placeobj>
<placeobj handle="_cef24ffc57f28a50ea65f0af645" change="1422125745" id="P0041" type="County"> <placeobj handle="_cef24ffc57f28a50ea65f0af645" change="1422125745" id="P0041" type="County">
<ptitle>Denver Co., CO, USA</ptitle> <ptitle>Denver Co., CO, USA</ptitle>
<name value="Denver Co."/> <pname value="Denver Co."/>
<placeref hlink="_cef244224d14af0273799b281e"/> <placeref hlink="_cef244224d14af0273799b281e"/>
</placeobj> </placeobj>
<placeobj handle="_cef2513e057732c3f27780750d" change="1422125877" id="P0042" type="County"> <placeobj handle="_cef2513e057732c3f27780750d" change="1422125877" id="P0042" type="County">
<ptitle>Washoe Co., NV, USA</ptitle> <ptitle>Washoe Co., NV, USA</ptitle>
<name value="Washoe Co."/> <pname value="Washoe Co."/>
<placeref hlink="_cef24468f6e3a984bf57967e95d"/> <placeref hlink="_cef24468f6e3a984bf57967e95d"/>
</placeobj> </placeobj>
</places> </places>

2578
example/gramps/example.gramps
View File

File diff suppressed because it is too large Load Diff

4
gramps/plugins/export/exportxml.py
View File

@ -736,7 +736,7 @@ class GrampsXmlWriter(UpdateCallback):
value = place_name.get_value() value = place_name.get_value()
date = place_name.get_date_object() date = place_name.get_date_object()
lang = place_name.get_language() lang = place_name.get_language()
self.g.write('%s<name value="%s"' % (sp, self.fix(value))) self.g.write('%s<pname value="%s"' % (sp, self.fix(value)))
if lang: if lang:
self.g.write(' lang="%s"' % self.fix(lang)) self.g.write(' lang="%s"' % self.fix(lang))
if date.is_empty(): if date.is_empty():
@ -744,7 +744,7 @@ class GrampsXmlWriter(UpdateCallback):
else: else:
self.g.write('>\n') self.g.write('>\n')
self.write_date(date, index+1) self.write_date(date, index+1)
self.g.write('%s</name>\n' % sp) self.g.write('%s</pname>\n' % sp)
def write_event(self,event,index=1): def write_event(self,event,index=1):
if not event: if not event:

11
gramps/plugins/importer/importxml.py
View File

@ -692,7 +692,8 @@ class GrampsParser(UpdateCallback):
"places": (None, self.stop_places), "places": (None, self.stop_places),
"placeobj": (self.start_placeobj, self.stop_placeobj), "placeobj": (self.start_placeobj, self.stop_placeobj),
"placeref": (self.start_placeref, self.stop_placeref), "placeref": (self.start_placeref, self.stop_placeref),
"ptitle": (None, self.stop_ptitle), "ptitle": (None, self.stop_ptitle),
"pname": (self.start_place_name, self.stop_place_name),
"location": (self.start_location, None), "location": (self.start_location, None),
"lds_ord": (self.start_lds_ord, self.stop_lds_ord), "lds_ord": (self.start_lds_ord, self.stop_lds_ord),
"temple": (self.start_temple, None), "temple": (self.start_temple, None),
@ -1703,8 +1704,8 @@ class GrampsParser(UpdateCallback):
def start_name(self, attrs): def start_name(self, attrs):
if self.person: if self.person:
self.start_person_name(attrs) self.start_person_name(attrs)
else: #else:
self.start_place_name(attrs) #self.start_place_name(attrs)
def start_place_name(self, attrs): def start_place_name(self, attrs):
self.place_name = PlaceName() self.place_name = PlaceName()
@ -2693,8 +2694,8 @@ class GrampsParser(UpdateCallback):
def stop_name(self, attrs): def stop_name(self, attrs):
if self.person: if self.person:
self.stop_person_name(attrs) self.stop_person_name(attrs)
else: #else:
self.stop_place_name(attrs) #self.stop_place_name(attrs)
def stop_place_name(self, tag): def stop_place_name(self, tag):
self.place_name = None self.place_name = None