From eff9145436de625fdf0be489be95118c69ec3a2e Mon Sep 17 00:00:00 2001
From: David Sommerseth <davids@redhat.com>
Date: Tue, 19 May 2009 17:02:47 +0200
Subject: Fixed the bios field mapping to use relative XPaths

---
 src/pythonmap.xml | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'src')

diff --git a/src/pythonmap.xml b/src/pythonmap.xml
index 90b2d88..b2d2d31 100644
--- a/src/pythonmap.xml
+++ b/src/pythonmap.xml
@@ -4,45 +4,45 @@
   <!-- Mapping setup for BIOS DMI data  -->
   <!--                                  -->
   <Mapping name="bios">
-    <Map keytype="string" key="/dmidecode/BIOSlanguage/@handle" valuetype="dict">
+    <Map rootpath="/dmidecode/BIOSlanguage" keytype="string" key="@handle" valuetype="dict">
       <Map keytype="constant" key="data" valuetype="dict">
         <Map keytype="constant" key="Currently Installed Language"
-             valuetype="list:string" value="/dmidecode/BIOSlanguage/Installed/Language"/>
+             valuetype="list:string" value="Installed/Language"/>
         <Map keytype="constant" key="Installed Languages"
-             valuetype="integer" value="/dmidecode/BIOSlanguage/@installable_languages"/>
+             valuetype="integer" value="@installable_languages"/>
       </Map>
-      <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 keytype="constant" key="dmi_type"   valuetype="integer" value="@type"/>
+      <Map keytype="constant" key="dmi_handle" valuetype="string" value="@handle"/>
+      <Map keytype="constant" key="dmi_size"   valuetype="integer" value="@size"/>
     </Map>
-    <Map keytype="string" key="/dmidecode/BIOSinfo/@handle" valuetype="dict">
+    <Map rootpath="/dmidecode/BIOSinfo" keytype="string" key="@handle" valuetype="dict">
       <Map keytype="constant" key="data" valuetype="dict">
-        <Map keytype="constant" key="Vendor" valuetype="string" value="/dmidecode/BIOSinfo/Vendor"/>
+        <Map keytype="constant" key="Vendor" valuetype="string" value="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 keytype="string" key="Characteristics/flags/flag[../../@level = '0']"
+               valuetype="boolean" value="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 keytype="string" key="Characteristics/characteristic[../@level = 'x1']"
+               valuetype="boolean" value="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 keytype="string" key="Characteristics/characteristic[../@level = 'x2']"
+               valuetype="boolean" value="Characteristics/characteristic/@enabled"/>
         </Map>
         <Map keytype="constant" key="Runtime Size" valuetype="string"
-             value="concat(/dmidecode/BIOSinfo/RuntimeSize,' ',/dmidecode/BIOSinfo/RuntimeSize/@unit)"/>
+             value="concat(RuntimeSize,' ',RuntimeSize/@unit)"/>
         <Map keytype="constant" key="BIOS Revision"
-             valuetype="string" value="/dmidecode/BIOSinfo/BIOSrevision"/>
-        <Map keytype="constant" key="Version" valuetype="string" value="/dmidecode/BIOSinfo/Version"/>
+             valuetype="string" value="BIOSrevision"/>
+        <Map keytype="constant" key="Version" valuetype="string" value="Version"/>
         <Map keytype="constant" key="ROM Size" valuetype="string"
-             value="concat(/dmidecode/BIOSinfo/ROMsize,' ',/dmidecode/BIOSinfo/ROMsize/@unit)"/>
-        <Map keytype="constant" key="Address" valuetype="string" value="/dmidecode/BIOSinfo/Address"/>
-        <Map keytype="constant" key="Relase Date" valuetype="string" value="/dmidecode/BIOSinfo/ReleaseDate"/>
+             value="concat(ROMsize,' ',ROMsize/@unit)"/>
+        <Map keytype="constant" key="Address" valuetype="string" value="Address"/>
+        <Map keytype="constant" key="Relase Date" valuetype="string" value="ReleaseDate"/>
       </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 keytype="constant" key="dmi_type"   valuetype="integer" value="@type"/>
+      <Map keytype="constant" key="dmi_handle" valuetype="string"  value="@handle"/>
+      <Map keytype="constant" key="dmi_size"   valuetype="integer" value="@size"/>
     </Map>
   </Mapping>
 
-- 
cgit