Skip to content

Commit 41c096c

Browse files
authored
code has changed...
structure of Place Element is now different with files generated by gramps 5.1.4
1 parent f50e5f1 commit 41c096c

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

lxml/grampsxml.dtd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ PLACES
252252

253253
<!ELEMENT places (placeobj)*>
254254

255-
<!ELEMENT placeobj (ptitle?, pname+, code?, coord?, placeref*, location*,
255+
<!ELEMENT placeobj (ptitle?, code?, pname+, coord?, placeref*, location*,
256256
objref*, url*, noteref*, citationref*, tagref*)>
257257
<!ATTLIST placeobj
258258
id CDATA #IMPLIED
@@ -574,3 +574,4 @@ SHARED ELEMENTS
574574
<!ATTLIST sealed_to
575575
hlink IDREF #REQUIRED
576576
>
577+

lxml/grampsxml.rng

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,10 +453,10 @@
453453
<ref name="primary-object"/>
454454
<attribute name="type"><text/></attribute>
455455
<optional><element name="ptitle"><text/></element></optional>
456+
<optional><element name="code"><text/></element></optional>
456457
<oneOrMore><element name="pname">
457458
<ref name="placename-content"/>
458459
</element></oneOrMore>
459-
<optional><element name="code"><text/></element></optional>
460460
<optional><element name="coord">
461461
<attribute name="long"><text/></attribute>
462462
<attribute name="lat"><text/></attribute>
@@ -768,3 +768,4 @@
768768
</define>
769769

770770
</grammar>
771+

lxml/grampsxml.xsd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,8 +536,8 @@
536536
<complexType>
537537
<sequence>
538538
<element ref='gramps:ptitle' minOccurs='0' maxOccurs='1'/>
539-
<element ref='gramps:pname' maxOccurs='unbounded'/>
540539
<element ref='gramps:code' minOccurs='0' maxOccurs='1'/>
540+
<element ref='gramps:pname' maxOccurs='unbounded'/>
541541
<element ref='gramps:coord' minOccurs='0' maxOccurs='1'/>
542542
<element ref='gramps:placeref' minOccurs='0' maxOccurs='unbounded'/>
543543
<element ref='gramps:location' minOccurs='0' maxOccurs='unbounded'/>
@@ -1210,3 +1210,4 @@
12101210
</complexType>
12111211
</element>
12121212
</schema>
1213+

0 commit comments

Comments
 (0)