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

5264: update location, researcher, address

Browse Source 
svn: r18222
This commit is contained in:
Jérôme Rapinat
2011-09-30 06:27:28 +00:00
parent e51d189b29
commit e59540d3fe
2 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
data/grampsxml.dtd
View File

@@ -58,9 +58,9 @@ DATABASE
tags tags
--> -->
<!ELEMENT database (header, name-formats?, tags?, events?, people?, families?, <!ELEMENT database (header, name-formats?, tags?, events?, people?,
sources?, places?, objects?, repositories?, notes?, families?, sources?, places?, objects?,
bookmarks?, namemaps?)> repositories?, notes?, bookmarks?, namemaps?)>
<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.4.0/"> <!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.4.0/">
@@ -80,16 +80,17 @@ HEADER
version CDATA #REQUIRED version CDATA #REQUIRED
> >
<!ELEMENT researcher (resname, resaddr?, rescity?, resstate?, <!ELEMENT researcher (resname?, resaddr?, reslocality?, rescity?, resstate?,
rescountry?, respostal?, resphone?, resemail?)> rescountry?, respostal?, resphone?, resemail?)>
<!ELEMENT resname (#PCDATA)> <!ELEMENT resname (#PCDATA)>
<!ELEMENT resaddr (#PCDATA)> <!ELEMENT resaddr (#PCDATA)>
<!ELEMENT rescity (#PCDATA)> <!ELEMENT reslocality (#PCDATA)>
<!ELEMENT resstate (#PCDATA)> <!ELEMENT rescity (#PCDATA)>
<!ELEMENT rescountry (#PCDATA)> <!ELEMENT resstate (#PCDATA)>
<!ELEMENT respostal (#PCDATA)> <!ELEMENT rescountry (#PCDATA)>
<!ELEMENT resphone (#PCDATA)> <!ELEMENT respostal (#PCDATA)>
<!ELEMENT resemail (#PCDATA)> <!ELEMENT resphone (#PCDATA)>
<!ELEMENT resemail (#PCDATA)>
<!ELEMENT mediapath (#PCDATA)> <!ELEMENT mediapath (#PCDATA)>
@@ -157,19 +158,19 @@ GENDER has values of M, F, or U.
rel CDATA #REQUIRED rel CDATA #REQUIRED
> >
<!ELEMENT address ((daterange|datespan|dateval|datestr)?, street?, city?, <!ELEMENT address ((daterange|datespan|dateval|datestr)?, street?,
county?, state?, country?, postal?, phone?, noteref*, locality?, city?, county?, state?, country?, postal?,
sourceref*)> phone?, noteref*, sourceref*)>
<!ATTLIST address priv (0|1) #IMPLIED> <!ATTLIST address priv (0|1) #IMPLIED>
<!ELEMENT street (#PCDATA)> <!ELEMENT street (#PCDATA)>
<!ELEMENT locality (#PCDATA)> <!ELEMENT locality (#PCDATA)>
<!ELEMENT city (#PCDATA)> <!ELEMENT city (#PCDATA)>
<!ELEMENT county (#PCDATA)> <!ELEMENT county (#PCDATA)>
<!ELEMENT country (#PCDATA)> <!ELEMENT state (#PCDATA)>
<!ELEMENT postal (#PCDATA)> <!ELEMENT country (#PCDATA)>
<!ELEMENT state (#PCDATA)> <!ELEMENT postal (#PCDATA)>
<!ELEMENT phone (#PCDATA)> <!ELEMENT phone (#PCDATA)>
<!-- ************************************************************ <!-- ************************************************************
@@ -264,14 +265,15 @@ PLACES
<!ELEMENT location EMPTY> <!ELEMENT location EMPTY>
<!ATTLIST location <!ATTLIST location
street CDATA #IMPLIED street CDATA #IMPLIED
city CDATA #IMPLIED locality CDATA #IMPLIED
parish CDATA #IMPLIED city CDATA #IMPLIED
county CDATA #IMPLIED parish CDATA #IMPLIED
state CDATA #IMPLIED county CDATA #IMPLIED
country CDATA #IMPLIED state CDATA #IMPLIED
postal CDATA #IMPLIED country CDATA #IMPLIED
phone CDATA #IMPLIED postal CDATA #IMPLIED
phone CDATA #IMPLIED
> >
<!-- ************************************************************ <!-- ************************************************************

2
data/grampsxml.rng
View File

@@ -133,6 +133,7 @@
<define name="researcher-content"> <define name="researcher-content">
<element name="resname"><text/></element> <element name="resname"><text/></element>
<optional><element name="resaddr"><text/></element></optional> <optional><element name="resaddr"><text/></element></optional>
<optional><element name="reslocality"><text/></element></optional>
<optional><element name="rescity"><text/></element></optional> <optional><element name="rescity"><text/></element></optional>
<optional><element name="resstate"><text/></element></optional> <optional><element name="resstate"><text/></element></optional>
<optional><element name="rescountry"><text/></element></optional> <optional><element name="rescountry"><text/></element></optional>
@@ -282,6 +283,7 @@
</attribute></optional> </attribute></optional>
<optional><ref name="date-content"/></optional> <optional><ref name="date-content"/></optional>
<optional><element name="street"><text/></element></optional> <optional><element name="street"><text/></element></optional>
<optional><element name="locality"><text/></element></optional>
<optional><element name="city"><text/></element></optional> <optional><element name="city"><text/></element></optional>
<optional><element name="county"><text/></element></optional> <optional><element name="county"><text/></element></optional>
<optional><element name="state"><text/></element></optional> <optional><element name="state"><text/></element></optional>