From 6a89cde8f253cb9826da4287007a869de99709a6 Mon Sep 17 00:00:00 2001
From: David Sommerseth <davids@redhat.com>
Date: Wed, 29 Apr 2009 13:09:07 +0200
Subject: Filter out BIOS characteristics with XPath expressions

---
 src/pythonmap.xml | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/pythonmap.xml b/src/pythonmap.xml
index 14f4f9b..d1bd9dc 100644
--- a/src/pythonmap.xml
+++ b/src/pythonmap.xml
@@ -11,27 +11,24 @@
       <Map keytype="constant" key="dmi_type"   valuetype="integer" value="/dmidecode/BIOSlanguage/@type"/>
       <Map keytype="constant" key="dmi_handle" valuetype="string" value="/dmidecode/BIOSlanguage/@handle"/>
       <Map keytype="constant" key="dmi_size"   valuetype="integer" value="/dmidecode/BIOSlanguage/@size"/>
-   </Map>
-   <Map keytype="string" key="/dmidecode/BIOSinfo/@handle" valuetype="dict">
-     <Map keytype="constant" key="Vendor" valuetype="string" value="/dmidecode/BIOSinfo/Vendor"/>
-     <Map keytype="constant" key="Characteristics" valuetype="dict">
-       <Map keytype="string" key="/dmidecode/BIOSinfo/Characteristics/flags/flag"
-            filter="/dmidecode/BIOSinfo/Characteristics/@level" filtervalue="0"
-            valuetype="boolean" value="/dmidecode/BIOSinfo/Characteristics/flags/flag/@enabled"/>
-     </Map>
-     <Map keytype="constant" key="Characteristic x1" valuetype="dict">
-       <Map keytype="string" key="/dmidecode/BIOSinfo/Characteristics/characteristic"
-            filter="/dmidecode/BIOSinfo/Characteristics/@level" filtervalue="x1"
-            valuetype="boolean" value="/dmidecode/BIOSinfo/Characteristics/characteristic/@enabled"/>
-     </Map>
-     <Map keytype="constant" key="Characteristic x2" valuetype="dict">
-       <Map keytype="string" key="/dmidecode/BIOSinfo/Characteristics/characteristic"
-            filter="/dmidecode/BIOSinfo/Characteristics/@level" filtervalue="x2"
-            valuetype="boolean" value="/dmidecode/BIOSinfo/Characteristics/characteristic/@enabled"/>
-     </Map>
+    </Map>
+    <Map keytype="string" key="/dmidecode/BIOSinfo/@handle" valuetype="dict">
+      <Map keytype="constant" key="Vendor" valuetype="string" value="/dmidecode/BIOSinfo/Vendor"/>
+      <Map keytype="constant" key="Characteristics" valuetype="dict">
+        <Map keytype="string" key="/dmidecode/BIOSinfo/Characteristics/flags/flag[../../@level = '0]"
+             valuetype="boolean" value="/dmidecode/BIOSinfo/Characteristics/flags/flag/@enabled"/>
+      </Map>
+      <Map keytype="constant" key="Characteristic x1" valuetype="dict">
+        <Map keytype="string" key="/dmidecode/BIOSinfo/Characteristics/characteristic[../@level = 'x1']"
+             valuetype="boolean" value="/dmidecode/BIOSinfo/Characteristics/characteristic/@enabled"/>
+      </Map>
+      <Map keytype="constant" key="Characteristic x2" valuetype="dict">
+        <Map keytype="string" key="/dmidecode/BIOSinfo/Characteristics/characteristic[../@level = 'x2']"
+             valuetype="boolean" value="/dmidecode/BIOSinfo/Characteristics/characteristic/@enabled"/>
+      </Map>
       <Map keytype="constant" key="dmi_type"   valuetype="integer" value="/dmidecode/BIOSinfo/@type"/>
       <Map keytype="constant" key="dmi_handle" valuetype="string" value="/dmidecode/BIOSinfo/@handle"/>
       <Map keytype="constant" key="dmi_size"   valuetype="integer" value="/dmidecode/BIOSinfo/@size"/>
-   </Map>
+    </Map>
   </Mapping>
 </dmidecode_fieldmap>
-- 
cgit