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

GEP18: big database change for source and citation

Browse Source 
svn: r22639
This commit is contained in:
Benny Malengier
2013-07-01 19:27:48 +00:00
parent 6c04f8b151
commit 38db8959fa
46 changed files with 11560 additions and 11401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/grampsxml.dtd
View File

@@ -229,7 +229,7 @@ SOURCES
-->
<!ELEMENT sources (source)*>
<!ELEMENT source (stitle?, sauthor?, spubinfo?, sabbrev?,
<!ELEMENT source (sname?, stemplate?, sabbrev?,
noteref*, objref*, srcattribute*, reporef*, tagref*)>
<!ATTLIST source
id CDATA #IMPLIED
@@ -237,9 +237,8 @@ SOURCES
priv (0|1) #IMPLIED
change CDATA #REQUIRED
>
<!ELEMENT stitle (#PCDATA)>
<!ELEMENT sauthor (#PCDATA)>
<!ELEMENT spubinfo (#PCDATA)>
<!ELEMENT sname (#PCDATA)>
<!ELEMENT stemplate (#PCDATA)>
<!ELEMENT sabbrev (#PCDATA)>
<!-- ************************************************************
@@ -368,7 +367,7 @@ CITATIONS
<!ELEMENT citations (citation)*>
<!ELEMENT citation ((daterange|datespan|dateval|datestr)?, page?, confidence?,
<!ELEMENT citation ((daterange|datespan|dateval|datestr)?, cname?, confidence?,
noteref*, objref*, srcattribute*, sourceref, tagref*)>
<!ATTLIST citation
id CDATA #IMPLIED
@@ -376,6 +375,7 @@ CITATIONS
priv (0|1) #IMPLIED
change CDATA #REQUIRED
>
<!ELEMENT cname (#PCDATA)>
<!-- ************************************************************
BOOKMARKS

7
data/grampsxml.rng
View File

@@ -430,7 +430,7 @@
<define name="citation-content">
<ref name="primary-object"/>
<optional><ref name="date-content"/></optional>
<optional><element name="page"><text/></element></optional>
<optional><element name="cname"><text/></element></optional>
<optional><element name="confidence"><text/></element></optional>
<zeroOrMore><element name="noteref">
<ref name="noteref-content"/>
@@ -448,9 +448,8 @@
<define name="source-content">
<ref name="primary-object"/>
<optional><element name="stitle"><text/></element></optional>
<optional><element name="sauthor"><text/></element></optional>
<optional><element name="spubinfo"><text/></element></optional>
<optional><element name="sname"><text/></element></optional>
<optional><element name="stemplate"><text/></element></optional>
<optional><element name="sabbrev"><text/></element></optional>
<zeroOrMore><element name="noteref">
<ref name="noteref-content"/>