From be4c39a654fc595a56e0b1d6f750a1ef0c4bef75 Mon Sep 17 00:00:00 2001
From: Alex Roitman <shura@gramps-project.org>
Date: Sat, 7 Oct 2006 19:09:05 +0000
Subject: [PATCH] 2006-10-07  Alex Roitman  <shura@gramps-project.org> 	*
 data/grampsxml.dtd: Update DTD for XML 1.1.3. 	* data/grampsxml.rng: Update
 schema for XML 1.1.3. 	* src/GrampsDb/_ReadXML.py (stop_county): Read county.
 	* src/GrampsDb/_WriteXML.py (write_address_list): Write county.

svn: r7363
---
 ChangeLog                 |  6 ++++++
 data/grampsxml.dtd        | 14 ++++++++------
 data/grampsxml.rng        |  4 +++-
 src/GrampsDb/_ReadXML.py  |  4 ++++
 src/GrampsDb/_WriteXML.py |  3 ++-
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 244b7d6d9..6e97d19f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-07  Alex Roitman  <shura@gramps-project.org>
+	* data/grampsxml.dtd: Update DTD for XML 1.1.3.
+	* data/grampsxml.rng: Update schema for XML 1.1.3.
+	* src/GrampsDb/_ReadXML.py (stop_county): Read county.
+	* src/GrampsDb/_WriteXML.py (write_address_list): Write county.
+
 2006-10-06  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
 	* src/PluginUtils/_Plugins.py: ignore pressing apply without
 	a plugin being selected
diff --git a/data/grampsxml.dtd b/data/grampsxml.dtd
index 80b9fd0b9..36e2eee1f 100644
--- a/data/grampsxml.dtd
+++ b/data/grampsxml.dtd
@@ -24,15 +24,15 @@
 -->
 
 <!--
-    This is the Document Type Definition file for v1.1.2
+    This is the Document Type Definition file for v1.1.3
     of the GRAMPS XML genealogy data format.
     Please use the following formal public identifier to identify it:
 
-    "-//GRAMPS//DTD GRAMPS XML V1.1.2//EN"
+    "-//GRAMPS//DTD GRAMPS XML V1.1.3//EN"
 
     For example:
-        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.1.2//EN"
-                "http://gramps-project.org/xml/1.1.2/grampsxml.dtd"
+        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.1.3//EN"
+                "http://gramps-project.org/xml/1.1.3/grampsxml.dtd"
                 [...]>
 -->
 
@@ -53,7 +53,7 @@ DATABASE
 
 <!ELEMENT database (header, name-formats?, events?, people?, families?,
                     sources?, places?, objects?, repositories?, bookmark?)>
-<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.1.2/">
+<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.1.3/">
 
 <!--	************************************************************
 HEADER
@@ -144,12 +144,13 @@ GENDER has values of M, F, or U.
   rel   CDATA #REQUIRED
 >
 
-<!ELEMENT address ((daterange|dateval|datestr)?,street?,city?,state?,
+<!ELEMENT address ((daterange|dateval|datestr)?,street?,city?,county?,state?,
                    country?,postal?,phone?,note?,sourceref?)>
 <!ATTLIST address priv (0|1) #IMPLIED>
 
 <!ELEMENT street  (#PCDATA)>
 <!ELEMENT city    (#PCDATA)>
+<!ELEMENT county  (#PCDATA)>
 <!ELEMENT country (#PCDATA)>
 <!ELEMENT postal  (#PCDATA)>
 <!ELEMENT state   (#PCDATA)>
@@ -251,6 +252,7 @@ PLACES
 
 <!ELEMENT location EMPTY>
 <!ATTLIST location
+    street  CDATA #IMPLIED
     city    CDATA #IMPLIED
     parish  CDATA #IMPLIED
     county  CDATA #IMPLIED
diff --git a/data/grampsxml.rng b/data/grampsxml.rng
index 03ff99536..4bc504a51 100644
--- a/data/grampsxml.rng
+++ b/data/grampsxml.rng
@@ -31,7 +31,7 @@
 
 <grammar
   datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"  
-  ns="http://gramps-project.org/xml/1.1.2/"
+  ns="http://gramps-project.org/xml/1.1.3/"
   xmlns="http://relaxng.org/ns/structure/1.0">
 
   <start><element name="database">
@@ -232,6 +232,7 @@
     <optional><ref name="date-content"/></optional>
     <optional><element name="street"><text/></element></optional>
     <optional><element name="city"><text/></element></optional>
+    <optional><element name="county"><text/></element></optional>
     <optional><element name="state"><text/></element></optional>
     <optional><element name="country"><text/></element></optional>
     <optional><element name="postal"><text/></element></optional>
@@ -369,6 +370,7 @@
         <attribute name="lat"><data type="float"/></attribute>
     </element></optional>
     <zeroOrMore><element name="location">
+        <optional><attribute name="street"><text/></attribute></optional>
         <optional><attribute name="city"><text/></attribute></optional>
         <optional><attribute name="parish"><text/></attribute></optional>
         <optional><attribute name="county"><text/></attribute></optional>
diff --git a/src/GrampsDb/_ReadXML.py b/src/GrampsDb/_ReadXML.py
index 6ba6ac323..94f466ba4 100644
--- a/src/GrampsDb/_ReadXML.py
+++ b/src/GrampsDb/_ReadXML.py
@@ -369,6 +369,7 @@ class GrampsParser(UpdateCallback):
             "childref"   : (self.start_childref,self.stop_childref),
             "personref"  : (self.start_personref,self.stop_personref),
             "city"       : (None, self.stop_city),
+            "county"     : (None, self.stop_county),
             "country"    : (None, self.stop_country),
             "comment"    : (None, self.stop_comment),
             "created"    : (self.start_created, None),
@@ -1641,6 +1642,9 @@ class GrampsParser(UpdateCallback):
     def stop_city(self,tag):
         self.address.city = tag
 
+    def stop_county(self,tag):
+        self.address.county = tag
+
     def stop_state(self,tag):
         self.address.state = tag
         
diff --git a/src/GrampsDb/_WriteXML.py b/src/GrampsDb/_WriteXML.py
index eb062ecf8..725b73331 100644
--- a/src/GrampsDb/_WriteXML.py
+++ b/src/GrampsDb/_WriteXML.py
@@ -70,7 +70,7 @@ except:
     _gzip_ok = 0
 
 
-_xml_version = "1.1.2"
+_xml_version = "1.1.3"
 
 # table for skipping control chars from XML
 strip_dict = dict.fromkeys(range(20))
@@ -504,6 +504,7 @@ class XmlWriter(UpdateCallback):
             self.write_date(address.get_date_object(),index+2)
             self.write_line("street",address.get_street(),index+2)
             self.write_line("city",address.get_city(),index+2)
+            self.write_line("county",address.get_county(),index+2)
             self.write_line("state",address.get_state(),index+2)
             self.write_line("country",address.get_country(),index+2)
             self.write_line("postal",address.get_postal_code(),index+2)