From e353f337bb0144b4980068ab21e3e13cf3e70bc0 Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Thu, 11 Jan 2007 20:01:33 +0000
Subject: Fixes from Rick

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2649 ce84e21b-d406-0410-9b95-82705330c041
---
 schemas/bundle.xsd               | 2 +-
 schemas/clients.xsd              | 8 +++++---
 schemas/metadata.xsd             | 8 +++++---
 schemas/report-configuration.xsd | 1 +
 src/lib/Server/Plugin.py         | 4 ++--
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd
index 685c7ca6f..55d6bc9b9 100644
--- a/schemas/bundle.xsd
+++ b/schemas/bundle.xsd
@@ -21,7 +21,7 @@
       <xsd:element name='Group' type='GroupType'/>
     </xsd:choice>
     <xsd:attribute type='xsd:string' name='name' use='required'/>
-    <xsd:attribute type='xsd:string' name='negate' use='required'/>
+    <xsd:attribute type='xsd:string' name='negate' />
   </xsd:complexType>
 
   <xsd:element name='Bundle'>
diff --git a/schemas/clients.xsd b/schemas/clients.xsd
index 26da2483f..7ff3471ad 100644
--- a/schemas/clients.xsd
+++ b/schemas/clients.xsd
@@ -29,9 +29,11 @@
       <xsd:choice minOccurs='0' maxOccurs='unbounded'>
 	<xsd:element name='Client' type='ClientType'/>
         <xsd:element name='Clients'>
-          <xsd:choice>
-            <xsd:element name='Client' type='ClientType'/>
-          </xsd:choice>
+          <xsd:complexType>
+            <xsd:choice>
+              <xsd:element name='Client' type='ClientType'/>
+            </xsd:choice>
+          </xsd:complexType>
         </xsd:element>
       </xsd:choice>
       <xsd:attribute name='version' type='xsd:string'/>
diff --git a/schemas/metadata.xsd b/schemas/metadata.xsd
index b58a8f40c..7f0a5a7c4 100644
--- a/schemas/metadata.xsd
+++ b/schemas/metadata.xsd
@@ -48,9 +48,11 @@
       <xsd:choice minOccurs='0' maxOccurs='unbounded'>
 	<xsd:element name='Group' type='groupType'/>
         <xsd:element name='Groups'>
-          <xsd:choice>
-            <xsd:element name='Group' type='groupType'/>
-          </xsd:choice>
+          <xsd:complexType>
+            <xsd:choice>
+              <xsd:element name='Group' type='groupType'/>
+            </xsd:choice>
+          </xsd:complexType>
         </xsd:element>
       </xsd:choice>
       <xsd:attribute name='version' type='xsd:string'/>
diff --git a/schemas/report-configuration.xsd b/schemas/report-configuration.xsd
index fad37e1e0..8e68e9bba 100644
--- a/schemas/report-configuration.xsd
+++ b/schemas/report-configuration.xsd
@@ -38,6 +38,7 @@
                         <xs:enumeration value="nodes-individual"/>
                         <xs:enumeration value="nodes-digest"/>
                         <xs:enumeration value="overview-stats"/>
+                        <xs:enumeration value="timing-summary"/>
                       </xs:restriction>
                     </xs:simpleType>
                   </xs:attribute>
diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py
index e5eca8f4e..a7648e9ca 100644
--- a/src/lib/Server/Plugin.py
+++ b/src/lib/Server/Plugin.py
@@ -220,9 +220,9 @@ class INode:
         else:
             predicate = parent.predicate
             if data.get('negate', 'false') == 'true':
-                psrc = raw
+                psrc = self.raw
             else:
-                psrc = nraw
+                psrc = self.nraw
             if data.tag in psrc.keys():
                 self.predicate = eval(psrc[data.tag] % (data.get('name')),
                                       {'predicate':predicate})
-- 
cgit v1.2.3-1-g7c22