From 500a81004f4f1210803a67a4302b93d2632abad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?= <romjerome@yahoo.fr>
Date: Fri, 30 Sep 2011 06:15:41 +0000
Subject: [PATCH] 5264: update location, researcher, address

svn: r18221
---
 data/grampsxml.dtd | 62 ++++++++++++++++++++++++----------------------
 data/grampsxml.rng |  2 ++
 2 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/data/grampsxml.dtd b/data/grampsxml.dtd
index f261ab4b3..13332121d 100644
--- a/data/grampsxml.dtd
+++ b/data/grampsxml.dtd
@@ -58,9 +58,9 @@ DATABASE
     tags
 -->
 
-<!ELEMENT database (header, name-formats?, tags?, events?, people?, families?,
-                    sources?, places?, objects?, repositories?, notes?,
-                    bookmarks?, namemaps?)>
+<!ELEMENT database (header, name-formats?, tags?, events?, people?, 
+                    families?, sources?, places?, objects?, 
+                    repositories?, notes?, bookmarks?, namemaps?)>
 <!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.4.0/">
 
 
@@ -80,16 +80,17 @@ HEADER
         version  CDATA #REQUIRED
 >
 
-<!ELEMENT researcher (resname, resaddr?, rescity?, resstate?,
+<!ELEMENT researcher (resname?, resaddr?, reslocality?, rescity?, resstate?,
                       rescountry?, respostal?, resphone?, resemail?)>
-<!ELEMENT resname    (#PCDATA)>
-<!ELEMENT resaddr    (#PCDATA)>
-<!ELEMENT rescity    (#PCDATA)>
-<!ELEMENT resstate   (#PCDATA)>
-<!ELEMENT rescountry (#PCDATA)>
-<!ELEMENT respostal  (#PCDATA)>
-<!ELEMENT resphone   (#PCDATA)>
-<!ELEMENT resemail   (#PCDATA)>
+<!ELEMENT resname        (#PCDATA)>
+<!ELEMENT resaddr        (#PCDATA)>
+<!ELEMENT reslocality    (#PCDATA)>
+<!ELEMENT rescity        (#PCDATA)>
+<!ELEMENT resstate       (#PCDATA)>
+<!ELEMENT rescountry     (#PCDATA)>
+<!ELEMENT respostal      (#PCDATA)>
+<!ELEMENT resphone       (#PCDATA)>
+<!ELEMENT resemail       (#PCDATA)>
 
 <!ELEMENT mediapath  (#PCDATA)>
 
@@ -157,19 +158,19 @@ GENDER has values of M, F, or U.
         rel   CDATA #REQUIRED
 >
 
-<!ELEMENT address ((daterange|datespan|dateval|datestr)?, street?, city?,
-                   county?, state?, country?, postal?, phone?, noteref*,
-                   sourceref*)>
+<!ELEMENT address ((daterange|datespan|dateval|datestr)?, street?, 
+                   locality?, city?, county?, state?, country?, postal?, 
+                   phone?, noteref*, sourceref*)>
 <!ATTLIST address priv (0|1) #IMPLIED>
 
-<!ELEMENT street  (#PCDATA)>
+<!ELEMENT street   (#PCDATA)>
 <!ELEMENT locality (#PCDATA)>
-<!ELEMENT city    (#PCDATA)>
-<!ELEMENT county  (#PCDATA)>
-<!ELEMENT country (#PCDATA)>
-<!ELEMENT postal  (#PCDATA)>
-<!ELEMENT state   (#PCDATA)>
-<!ELEMENT phone   (#PCDATA)>
+<!ELEMENT city     (#PCDATA)>
+<!ELEMENT county   (#PCDATA)>
+<!ELEMENT state    (#PCDATA)>
+<!ELEMENT country  (#PCDATA)>
+<!ELEMENT postal   (#PCDATA)>
+<!ELEMENT phone    (#PCDATA)>
 
 
 <!--    ************************************************************
@@ -264,14 +265,15 @@ PLACES
 
 <!ELEMENT location EMPTY>
 <!ATTLIST location
-        street  CDATA #IMPLIED
-        city    CDATA #IMPLIED
-        parish  CDATA #IMPLIED
-        county  CDATA #IMPLIED
-        state   CDATA #IMPLIED
-        country CDATA #IMPLIED
-        postal  CDATA #IMPLIED
-        phone   CDATA #IMPLIED
+        street   CDATA #IMPLIED
+        locality CDATA #IMPLIED
+        city     CDATA #IMPLIED
+        parish   CDATA #IMPLIED
+        county   CDATA #IMPLIED
+        state    CDATA #IMPLIED
+        country  CDATA #IMPLIED
+        postal   CDATA #IMPLIED
+        phone    CDATA #IMPLIED
 >
 
 <!--    ************************************************************
diff --git a/data/grampsxml.rng b/data/grampsxml.rng
index 9636b7ec8..3af6cc1bb 100644
--- a/data/grampsxml.rng
+++ b/data/grampsxml.rng
@@ -133,6 +133,7 @@
   <define name="researcher-content">
       <element name="resname"><text/></element>
       <optional><element name="resaddr"><text/></element></optional>
+      <optional><element name="reslocality"><text/></element></optional>
       <optional><element name="rescity"><text/></element></optional>
       <optional><element name="resstate"><text/></element></optional>
       <optional><element name="rescountry"><text/></element></optional>
@@ -282,6 +283,7 @@
     </attribute></optional>
     <optional><ref name="date-content"/></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="county"><text/></element></optional>
     <optional><element name="state"><text/></element></optional>