From: Andy Bavier <acb@cs.princeton.edu>
Date: Thu, 18 Feb 2010 18:39:36 +0000 (+0000)
Subject: Tweaks to request element
X-Git-Tag: sfa-0.9-11~89
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=22b86a30343e3b7314e1da19b2234e16abd8cf20;hp=4acf5e0267df502cbc118172b154e32d8d16fa65;p=sfa.git

Tweaks to request element
---

diff --git a/sfa/managers/pl/pl.rnc b/sfa/managers/pl/pl.rnc
index a4295d26..098aa2e2 100644
--- a/sfa/managers/pl/pl.rnc
+++ b/sfa/managers/pl/pl.rnc
@@ -24,7 +24,9 @@ node = element node {
    sliver*
 }
 request = element request {
-   sliver+
+   attribute name { xsd:NMTOKEN },
+   sliver_defaults?,
+   sliver*
 }
 sliver = element sliver { 
    attribute nodeid { xsd:ID }?,
diff --git a/sfa/managers/pl/pl.rng b/sfa/managers/pl/pl.rng
index 525db3ef..3b46f885 100644
--- a/sfa/managers/pl/pl.rng
+++ b/sfa/managers/pl/pl.rng
@@ -73,9 +73,15 @@
   </define>
   <define name="request">
     <element name="request">
-      <oneOrMore>
+      <attribute name="name">
+        <data type="NMTOKEN"/>
+      </attribute>
+      <optional>
+        <ref name="sliver_defaults"/>
+      </optional>
+      <zeroOrMore>
         <ref name="sliver"/>
-      </oneOrMore>
+      </zeroOrMore>
     </element>
   </define>
   <define name="sliver">