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

5264: minor validation issues on researcher and person reference

Browse Source 
svn: r18219
This commit is contained in:
Jérôme Rapinat 2011-09-29 16:02:49 +00:00
parent 88cbf1b68a
commit e51d189b29
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
data/grampsxml.rng
View File

@ -42,10 +42,15 @@
<attribute name="date"><data type="date"/></attribute> <attribute name="date"><data type="date"/></attribute>
<attribute name="version"><text/></attribute> <attribute name="version"><text/></attribute>
</element> </element>
<optional><element name="researcher"> <element name="researcher">
<optional>
<ref name="researcher-content"/> <ref name="researcher-content"/>
</element></optional> </optional>
<optional><element name="mediapath"><text/></element></optional> </element>
<optional>
<element name="mediapath"><text/>
</element>
</optional>
</element> </element>
<optional><element name="name-formats"> <optional><element name="name-formats">
@ -185,11 +190,7 @@
<attribute name="hlink"><data type="IDREF"/></attribute> <attribute name="hlink"><data type="IDREF"/></attribute>
</element></zeroOrMore> </element></zeroOrMore>
<zeroOrMore><element name="personref"> <zeroOrMore><element name="personref">
<attribute name="hlink"><data type="IDREF"/></attribute> <ref name="personref-content"/>
<optional><attribute name="priv">
<ref name="priv-content"/>
</attribute></optional>
<attribute name="rel"><text/></attribute>
</element></zeroOrMore> </element></zeroOrMore>
<zeroOrMore><element name="noteref"> <zeroOrMore><element name="noteref">
<ref name="noteref-content"/> <ref name="noteref-content"/>
@ -578,6 +579,17 @@
</element></zeroOrMore> </element></zeroOrMore>
</define> </define>
<define name="personref-content">
<attribute name="hlink"><data type="IDREF"/></attribute>
<optional><attribute name="priv">
<ref name="priv-content"/>
</attribute></optional>
<attribute name="rel"><text/></attribute>
<optional><zeroOrMore><element name="sourceref">
<ref name="sourceref-content"/>
</element></zeroOrMore></optional>
</define>
<define name="sourceref-content"> <define name="sourceref-content">
<attribute name="hlink"><data type="IDREF"/></attribute> <attribute name="hlink"><data type="IDREF"/></attribute>
<optional><attribute name="priv"> <optional><attribute name="priv">