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

2007-07-10 Alex Roitman <shura@gramps-project.org>

Browse Source 
* src/GrampsDb/_ReadXML.py (start_compound_date): Add new method;
	(start_datespan): Add new method.
	* data/grampsxml.dtd: Add datespan.
	* data/grampsxml.rng: Add datespan.
	* src/GrampsDb/_WriteXML.py (XmlWriter.write_date): Write the
	datespan.



svn: r8711
This commit is contained in:
Alex Roitman
2007-07-11 04:13:05 +00:00
parent dc185b12ac
commit 6575eede14
5 changed files with 46 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
data/grampsxml.dtd
View File

@@ -109,7 +109,7 @@ GENDER has values of M, F, or U.
<!ELEMENT gender (#PCDATA)>
<!ELEMENT name (first?,call?,last?,suffix?,patronymic?,title?,
(daterange|dateval|datestr)?,note?,sourceref*)>
(daterange|datespan|dateval|datestr)?,note?,sourceref*)>
<!ATTLIST name
alt (0|1) #IMPLIED
type CDATA #IMPLIED
@@ -145,8 +145,8 @@ GENDER has values of M, F, or U.
rel CDATA #REQUIRED
>
<!ELEMENT address ((daterange|dateval|datestr)?,street?,city?,county?,state?,
country?,postal?,phone?,note?,sourceref*)>
<!ELEMENT address ((daterange|datespan|dateval|datestr)?,street?,city?,
county?,state?,country?,postal?,phone?,note?,sourceref*)>
<!ATTLIST address priv (0|1) #IMPLIED>
<!ELEMENT street (#PCDATA)>
@@ -199,7 +199,7 @@ EVENT
-->
<!ELEMENT events (event)*>
<!ELEMENT event (type?,(daterange|dateval|datestr)?,place?,cause?,
<!ELEMENT event (type?,(daterange|datespan|dateval|datestr)?,place?,cause?,
description?,attribute*,note?,sourceref*,objref*)>
<!ATTLIST event
id CDATA #REQUIRED
@@ -269,7 +269,7 @@ OBJECTS
<!ELEMENT objects (object)*>
<!ELEMENT object (file,attribute*,note?,(daterange|dateval|datestr)?,
<!ELEMENT object (file,attribute*,note?,(daterange|datespan|dateval|datestr)?,
sourceref*)>
<!ATTLIST object
id CDATA #REQUIRED
@@ -339,6 +339,14 @@ SHARED ELEMENTS
cformat CDATA #IMPLIED
>
<!ELEMENT datespan EMPTY>
<!ATTLIST datespan
start CDATA #REQUIRED
stop CDATA #REQUIRED
quality (estimated|calculated) #IMPLIED
cformat CDATA #IMPLIED
>
<!ELEMENT dateval EMPTY>
<!ATTLIST dateval
val CDATA #REQUIRED

9
data/grampsxml.rng
View File

@@ -257,6 +257,15 @@
</choice></attribute></optional>
<optional><attribute name="cformat"><text/></attribute></optional>
</element>
<element name="datespan">
<attribute name="start"><text/></attribute>
<attribute name="stop"><text/></attribute>
<optional><attribute name="quality"><choice>
<value>estimated</value>
<value>calculated</value>
</choice></attribute></optional>
<optional><attribute name="cformat"><text/></attribute></optional>
</element>
<element name="dateval">
<attribute name="val"><text/></attribute>
<optional><attribute name="cformat"><text/></attribute></optional>