From c3e5e4683497edc4826505e259e7e3b27eda1dab Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Sat, 8 Nov 2014 18:01:58 +0000
Subject: Simplify RRDP schema again: one delta file now contains exactly one
 delta rather than a range.

svn path=/branches/tk705/; revision=6010
---
 schemas/relaxng/rrdp.rnc | 22 ++++++++++------------
 schemas/relaxng/rrdp.rng | 21 ++++-----------------
 2 files changed, 14 insertions(+), 29 deletions(-)

(limited to 'schemas')

diff --git a/schemas/relaxng/rrdp.rnc b/schemas/relaxng/rrdp.rnc
index 2829605d..7809abdd 100644
--- a/schemas/relaxng/rrdp.rnc
+++ b/schemas/relaxng/rrdp.rnc
@@ -36,10 +36,9 @@ start |= element notification {
     attribute hash { hash }
   },
   element delta {
-    attribute from { serial },
-    attribute to   { serial },
-    attribute uri  { uri },
-    attribute hash { hash }
+    attribute serial { serial },
+    attribute uri    { uri },
+    attribute hash   { hash }
   }*
 }
 
@@ -49,20 +48,19 @@ start |= element snapshot {
   attribute version    { version },
   attribute session_id { uuid },
   attribute serial     { serial },
-  element publish      { attribute uri { uri }, base64 }*
+  element publish      {
+    attribute uri { uri },
+    base64
+  }*
 }
 
 # Delta segment: think DNS IXFR.
 
-start |= element deltas {
+start |= element delta {
   attribute version    { version },
   attribute session_id { uuid },
-  attribute from       { serial },
-  attribute to         { serial },
-  element delta {
-    attribute serial   { serial },
-    delta_element+
-  }+
+  attribute serial     { serial },
+  delta_element+
 }
 
 delta_element |= element publish  {
diff --git a/schemas/relaxng/rrdp.rng b/schemas/relaxng/rrdp.rng
index 9bd3a207..9ff2ff1e 100644
--- a/schemas/relaxng/rrdp.rng
+++ b/schemas/relaxng/rrdp.rng
@@ -65,10 +65,7 @@
       </element>
       <zeroOrMore>
         <element name="delta">
-          <attribute name="from">
-            <ref name="serial"/>
-          </attribute>
-          <attribute name="to">
+          <attribute name="serial">
             <ref name="serial"/>
           </attribute>
           <attribute name="uri">
@@ -105,28 +102,18 @@
   </start>
   <!-- Delta segment: think DNS IXFR. -->
   <start combine="choice">
-    <element name="deltas">
+    <element name="delta">
       <attribute name="version">
         <ref name="version"/>
       </attribute>
       <attribute name="session_id">
         <ref name="uuid"/>
       </attribute>
-      <attribute name="from">
-        <ref name="serial"/>
-      </attribute>
-      <attribute name="to">
+      <attribute name="serial">
         <ref name="serial"/>
       </attribute>
       <oneOrMore>
-        <element name="delta">
-          <attribute name="serial">
-            <ref name="serial"/>
-          </attribute>
-          <oneOrMore>
-            <ref name="delta_element"/>
-          </oneOrMore>
-        </element>
+        <ref name="delta_element"/>
       </oneOrMore>
     </element>
   </start>
-- 
cgit v1.2.3