From 499dae6a2d468591fa652b562717617decc72ee5 Mon Sep 17 00:00:00 2001
From: Vassilii Khachaturov <vassilii@tarunz.org>
Date: Sun, 20 Oct 2013 12:57:22 +0000
Subject: [PATCH] 7125/7102: fix with DTD change as OKed by NickH

impex.sh test currently broken until the new DTD/schema go online

svn: r23347
---
 data/grampsxml.dtd              | 12 ++++++------
 data/grampsxml.rng              |  4 ++--
 src/plugins/import/ImportXml.py |  4 +++-
 src/plugins/lib/libgrampsxml.py |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/data/grampsxml.dtd b/data/grampsxml.dtd
index 667c4a317..a83806240 100644
--- a/data/grampsxml.dtd
+++ b/data/grampsxml.dtd
@@ -25,15 +25,15 @@
 -->
 
 <!--
-    This is the Document Type Definition file for v1.5.0
+    This is the Document Type Definition file for v1.5.1
     of the GRAMPS XML genealogy data format.
     Please use the following formal public identifier to identify it:
 
-    "-//GRAMPS//DTD GRAMPS XML V1.5.0//EN"
+    "-//GRAMPS//DTD GRAMPS XML V1.5.1//EN"
 
     For example:
-        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.5.0//EN"
-                "http://gramps-project.org/xml/1.5.0/grampsxml.dtd"
+        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.5.1//EN"
+                "http://gramps-project.org/xml/1.5.1/grampsxml.dtd"
                 [...]>
 -->
 
@@ -62,7 +62,7 @@ DATABASE
 <!ELEMENT database (header, name-formats?, tags?, events?, people?, families?,
                     citations?, sources?, places?, objects?, repositories?,
                     notes?, bookmarks?, namemaps?)>
-<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.5.0/">
+<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.5.1/">
 
 
 <!--    ************************************************************
@@ -367,7 +367,7 @@ CITATIONS
 
 <!ELEMENT citations (citation)*>
 
-<!ELEMENT citation ((daterange|datespan|dateval|datestr)?, page?, confidence?,
+<!ELEMENT citation ((daterange|datespan|dateval|datestr)?, page?, confidence,
                     noteref*, objref*, data_item*, sourceref)>
 <!ATTLIST citation
         id        CDATA #IMPLIED
diff --git a/data/grampsxml.rng b/data/grampsxml.rng
index 258889cb1..0344ce1aa 100644
--- a/data/grampsxml.rng
+++ b/data/grampsxml.rng
@@ -32,7 +32,7 @@
 
 <grammar
   datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"  
-  ns="http://gramps-project.org/xml/1.5.0/"
+  ns="http://gramps-project.org/xml/1.5.1/"
   xmlns="http://relaxng.org/ns/structure/1.0">
 
   <start><element name="database">
@@ -434,7 +434,7 @@
     <ref name="primary-object"/>
     <optional><ref name="date-content"/></optional>
     <optional><element name="page"><text/></element></optional>
-    <optional><element name="confidence"><text/></element></optional>
+    <element name="confidence"><text/></element>
     <zeroOrMore><element name="noteref">
         <ref name="noteref-content"/>
     </element></zeroOrMore>
diff --git a/src/plugins/import/ImportXml.py b/src/plugins/import/ImportXml.py
index 4f5d26016..e3c46d6a8 100644
--- a/src/plugins/import/ImportXml.py
+++ b/src/plugins/import/ImportXml.py
@@ -1933,7 +1933,9 @@ class GrampsParser(UpdateCallback):
                           self.citation)
         self.citation.private = bool(attrs.get("priv"))
         self.citation.change = int(attrs.get('change', self.change))
-        self.citation.confidence = self.conf # default
+        self.citation.confidence = (
+                self.conf if self.__xml_version >= '1.5.1' 
+                else 0 ) # See bug# 7125
         self.info.add('new-object', CITATION_KEY, self.citation)
         return self.citation
 
diff --git a/src/plugins/lib/libgrampsxml.py b/src/plugins/lib/libgrampsxml.py
index 728474c9e..e217e5a6c 100644
--- a/src/plugins/lib/libgrampsxml.py
+++ b/src/plugins/lib/libgrampsxml.py
@@ -35,5 +35,5 @@
 # Public Constants
 #
 #------------------------------------------------------------------------
-GRAMPS_XML_VERSION = "1.5.0"
+GRAMPS_XML_VERSION = "1.5.1"