Rework the XSLT template for rteval-parserd to tackle rteval v2.0 reports

This reorganises most of the XSLT template, separating out pre v2.0 and post v2.0
reports, preserving support for all report versions.  Also tried to preserve as
much as possible of common code.

Signed-off-by: David Sommerseth <davids@redhat.com>

1 files changed, 499 insertions, 259 deletions

diff --git a/server/parser/xmlparser.xsl b/server/parser/xmlparser.xsl
index eae7324..987cdf6 100644
--- a/server/parser/xmlparser.xsl
+++ b/server/parser/xmlparser.xsl
@@ -28,215 +28,41 @@
   <!-- Used for iterating CPU topology information -->
   <xsl:key name="pkgkey" match="cpu" use="@physical_package_id"/>
 
-  <xsl:template match="/rteval">
+
+  <!-- Supported tables in reports in rteval v1.37 and older -->
+  <xsl:template match="/rteval['2.0' > @version]">
     <xsl:choose>
       <!-- TABLE: systems -->
       <xsl:when test="$table = 'systems'">
-	<sqldata schemaver="1.0" table="systems" key="syskey">
-	  <fields>
-            <field fid="0">sysid</field>
-            <field fid="1">dmidata</field>
-	  </fields>
-	  <records>
-            <record>
-              <value fid="0" hash="sha1">
-		<xsl:value-of select="concat(HardwareInfo/@SystemUUID,':',HardwareInfo/@SerialNo)"/>
-              </value>
-              <value fid="1" type="xmlblob">
-		<xsl:copy-of select="HardwareInfo"/>
-              </value>
-            </record>
-	  </records>
-	</sqldata>
+        <xsl:apply-templates select="HardwareInfo" mode="tbl_systems"/>
       </xsl:when>
 
       <!-- TABLE: systems_hostname -->
       <xsl:when test="$table = 'systems_hostname'">
-        <xsl:if test="string(number($syskey)) = 'NaN'">
-          <xsl:message terminate="yes">
-            <xsl:text>Invalid 'syskey' parameter value: </xsl:text><xsl:value-of select="syskey"/>
-          </xsl:message>
-        </xsl:if>
-	<sqldata schemaver="1.0" table="systems_hostname">
-	  <fields>
-            <field fid="0">syskey</field>
-            <field fid="1">hostname</field>
-            <field fid="2">ipaddr</field>
-	  </fields>
-	  <records>
-            <record>
-              <value fid="0"><xsl:value-of select="$syskey"/></value>
-              <value fid="1"><xsl:value-of select="uname/node"/></value>
-              <value fid="2"><xsl:value-of select="network_config/interface/IPv4[@defaultgw=1]/@ipaddr"/></value>
-            </record>
-	  </records>
-	</sqldata>
+        <xsl:apply-templates select="." mode="tbl_systems_hostname"/>
       </xsl:when>
 
       <!-- TABLE: rtevalruns -->
       <xsl:when test="$table = 'rtevalruns'">
-        <xsl:if test="string(number($syskey)) = 'NaN'">
-          <xsl:message terminate="yes">
-            <xsl:text>Invalid 'syskey' parameter value: </xsl:text><xsl:value-of select="syskey"/>
-          </xsl:message>
-        </xsl:if>
-        <xsl:if test="string(number($rterid)) = 'NaN'">
-          <xsl:message terminate="yes">
-            <xsl:text>Invalid rterid' parameter value: </xsl:text><xsl:value-of select="$rterid"/>
-          </xsl:message>
-        </xsl:if>
-        <xsl:if test="$report_filename = ''">
-          <xsl:message terminate="yes">
-            <xsl:text>The parameter 'report_filename' parameter cannot be empty</xsl:text>
-          </xsl:message>
-        </xsl:if>
-	<sqldata schemaver="1.2" table="rtevalruns">
-	  <fields>
-            <field fid="0">syskey</field>
-            <field fid="1">kernel_ver</field>
-            <field fid="2">kernel_rt</field>
-            <field fid="3">arch</field>
-            <field fid="4">run_start</field>
-            <field fid="5">run_duration</field>
-            <field fid="6">load_avg</field>
-            <field fid="7">version</field>
-            <field fid="8">report_filename</field>
-	    <field fid="9">rterid</field>
-	    <field fid="10">submid</field>
-	    <field fid="11">distro</field>
-	  </fields>
-	  <records>
-            <record>
-              <value fid="0"><xsl:value-of select="$syskey"/></value>
-              <value fid="1"><xsl:value-of select="uname/kernel"/></value>
-              <value fid="2"><xsl:choose>
-		  <xsl:when test="uname/kernel/@is_RT = '1'">true</xsl:when>
-		  <xsl:otherwise>false</xsl:otherwise></xsl:choose>
-              </value>
-              <value fid="3"><xsl:value-of select="uname/arch"/></value>
-              <value fid="4"><xsl:value-of select="concat(run_info/date, ' ', run_info/time)"/></value>
-              <value fid="5">
-		<xsl:value-of select="(run_info/@days*86400)+(run_info/@hours*3600)
-                                      +(run_info/@minutes*60)+(run_info/@seconds)"/>
-              </value>
-              <value fid="6"><xsl:value-of select="loads/@load_average"/></value>
-              <value fid="7"><xsl:value-of select="@version"/></value>
-              <value fid="8"><xsl:value-of select="$report_filename"/></value>
-              <value fid="9"><xsl:value-of select="$rterid"/></value>
-              <value fid="10"><xsl:value-of select="$submid"/></value>
-	      <value fid="11"><xsl:value-of select="uname/baseos"/></value>
-            </record>
-	  </records>
-	</sqldata>
+        <xsl:apply-templates select="." mode="tbl_rtevalruns"/>
       </xsl:when>
 
       <!-- TABLE: rtevalruns_details -->
       <xsl:when test="$table = 'rtevalruns_details'">
-        <xsl:if test="string(number($rterid)) = 'NaN'">
-          <xsl:message terminate="yes">
-            <xsl:text>Invalid 'rterid' parameter value: </xsl:text><xsl:value-of select="$rterid"/>
-          </xsl:message>
-        </xsl:if>
-        <sqldata schemaver="1.4" table="rtevalruns_details">
-          <fields>
-            <field fid="0">rterid</field>
-            <field fid="1">numa_nodes</field>
-            <field fid="2">num_cpu_cores</field>
-            <field fid="3">num_cpu_sockets</field>
-            <field fid="4">xmldata</field>
-            <field fid="5">annotation</field>
-            <field fid="6">cpu_core_spread</field>
-          </fields>
-          <records>
-            <record>
-              <value fid="0"><xsl:value-of select="$rterid"/></value>
-              <value fid="1"><xsl:value-of select="hardware/numa_nodes"/></value>
-              <value fid="2">
-                <xsl:choose>
-                  <xsl:when test="hardware/cpu_topology">
-                    <xsl:value-of select="hardware/cpu_topology/@num_cpu_cores"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:value-of select="hardware/cpu_cores"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </value>
-              <value fid="3">
-                <xsl:value-of select="hardware/cpu_topology/@num_cpu_sockets"/>
-              </value>
-              <value fid="4" type="xmlblob">
-                <rteval_details>
-                  <xsl:copy-of select="clocksource|services|kthreads|network_config|loads|cyclictest/command_line"/>
-                  <hardware>
-                    <xsl:copy-of select="hardware/memory_size|hardware/cpu_topology"/>
-                  </hardware>
-                </rteval_details>
-              </value>
-              <value fid="5"><xsl:value-of select="run_info/annotate"/></value>
-              <value fid="6" type="array">
-                <xsl:for-each select="hardware/cpu_topology/cpu[generate-id() = generate-id(key('pkgkey', @physical_package_id)[1])]">
-                  <xsl:call-template name="count_core_spread">
-                    <xsl:with-param name="pkgid" select="@physical_package_id"/>
-                  </xsl:call-template>
-                </xsl:for-each>
-              </value>
-            </record>
-          </records>
-        </sqldata>
+        <xsl:apply-templates select="." mode="tbl_rtevalruns_details"/>
       </xsl:when>
 
       <!-- TABLE: cyclic_statistics -->
       <xsl:when test="$table = 'cyclic_statistics'">
-        <xsl:if test="string(number($rterid)) = 'NaN'">
-          <xsl:message terminate="yes">
-            <xsl:text>Invalid 'rterid' parameter value: </xsl:text><xsl:value-of select="$rterid"/>
-          </xsl:message>
-        </xsl:if>
-	<sqldata schemaver="1.1" table="cyclic_statistics">
-	  <fields>
-            <field fid="0">rterid</field>
-            <field fid="1">coreid</field>
-            <field fid="2">priority</field>
-            <field fid="3">num_samples</field>
-            <field fid="4">lat_min</field>
-            <field fid="5">lat_max</field>
-            <field fid="6">lat_mean</field>
-            <field fid="7">mode</field>
-            <field fid="8">range</field>
-            <field fid="9">median</field>
-            <field fid="10">stddev</field>
-	    <field fid="11">mean_abs_dev</field>
-	    <field fid="12">variance</field>
-	  </fields>
-	  <records>
-            <xsl:for-each select="cyclictest/core/statistics|cyclictest/system/statistics">
-              <record>
-		<value fid="0"><xsl:value-of select="$rterid"/></value>
-		<value fid="1"><xsl:choose>
-		    <xsl:when test="../@id"><xsl:value-of select="../@id"/></xsl:when>
-		    <xsl:otherwise><xsl:attribute name="isnull">1</xsl:attribute></xsl:otherwise></xsl:choose>
-		</value>
-		<value fid="2"><xsl:choose>
-		    <xsl:when test="../@priority"><xsl:value-of select="../@priority"/></xsl:when>
-		    <xsl:otherwise><xsl:attribute name="isnull">1</xsl:attribute></xsl:otherwise></xsl:choose>
-		</value>
-		<value fid="3"><xsl:value-of select="samples"/></value>
-		<value fid="4"><xsl:value-of select="minimum"/></value>
-		<value fid="5"><xsl:value-of select="maximum"/></value>
-		<value fid="6"><xsl:value-of select="median"/></value>
-		<value fid="7"><xsl:value-of select="mode"/></value>
-		<value fid="8"><xsl:value-of select="range"/></value>
-		<value fid="9"><xsl:value-of select="mean"/></value>
-		<value fid="10"><xsl:value-of select="standard_deviation"/></value>
-		<value fid="11"><xsl:value-of select="mean_absolute_deviation"/></value>
-		<value fid="12"><xsl:value-of select="variance"/></value>
-              </record>
-            </xsl:for-each>
-	  </records>
-	</sqldata>
+        <xsl:apply-templates select="cyclictest" mode="tbl_cyclictest_statistics"/>
+      </xsl:when>
+
+      <!-- TABLE: cyclic_histogram -->
+      <xsl:when test="$table = 'cyclic_histogram'">
+        <xsl:apply-templates select="cyclictest" mode="tbl_cyclictest_histogram"/>
       </xsl:when>
 
-      <!-- TABLE: cyclic_rawdata -->
+      <!-- TABLE: cyclic_rawdata - only used by rteval v1.4 and earlier -->
       <xsl:when test="$table = 'cyclic_rawdata'">
         <xsl:if test="string(number($rterid)) = 'NaN'">
           <xsl:message terminate="yes">
@@ -263,71 +89,66 @@
 	</sqldata>
       </xsl:when>
 
+      <!-- Tables only used by rteval v2.0 and newer - just ignore them to avoid parsing warnings -->
+      <xsl:when test="$table = 'hwlatdetect_summary'">
+      </xsl:when>
+      <xsl:when test="$table = 'hwlatdetect_samples'">
+      </xsl:when>
+
+      <xsl:otherwise>
+        <xsl:message terminate="yes">
+          <xsl:text>Invalid 'table' parameter value: </xsl:text><xsl:value-of select="$table"/>
+        </xsl:message>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+
+  <!-- Supported tables in reports from rteval v2.0 and newer -->
+  <xsl:template match="/rteval[@version >= '2.0']">
+    <xsl:choose>
+      <!-- TABLE: systems -->
+      <xsl:when test="$table = 'systems'">
+        <xsl:apply-templates select="SystemInfo/DMIinfo/HardwareInfo" mode="tbl_systems"/>
+      </xsl:when>
+
+      <!-- TABLE: systems_hostname -->
+      <xsl:when test="$table = 'systems_hostname'">
+        <xsl:apply-templates select="SystemInfo" mode="tbl_systems_hostname"/>
+      </xsl:when>
+
+      <!-- TABLE: rtevalruns -->
+      <xsl:when test="$table = 'rtevalruns'">
+        <xsl:apply-templates select="." mode="tbl_rtevalruns"/>
+      </xsl:when>
+
+      <!-- TABLE: rtevalruns_details -->
+      <xsl:when test="$table = 'rtevalruns_details'">
+        <xsl:apply-templates select="SystemInfo" mode="tbl_rtevalruns_details"/>
+      </xsl:when>
+
+      <!-- TABLE: cyclic_statistics -->
+      <xsl:when test="$table = 'cyclic_statistics'">
+        <xsl:apply-templates select="Measurements/Profile/cyclictest" mode="tbl_cyclictest_statistics"/>
+      </xsl:when>
+
       <!-- TABLE: cyclic_histogram -->
       <xsl:when test="$table = 'cyclic_histogram'">
-        <xsl:if test="string(number($rterid)) = 'NaN'">
-          <xsl:message terminate="yes">
-            <xsl:text>Invalid 'rterid' parameter value: </xsl:text><xsl:value-of select="$rterid"/>
-          </xsl:message>
-        </xsl:if>
-	<sqldata schemaver="1.0" table="cyclic_histogram">
-	  <fields>
-            <field fid="0">rterid</field>
-            <field fid="1">core</field>
-            <field fid="2">index</field>
-            <field fid="3">value</field>
-	  </fields>
-	  <records>
-            <xsl:apply-templates select="/rteval/cyclictest/system/histogram/bucket"
-				 mode="cyclic_histogram_rec_sql"/>
-            <xsl:apply-templates select="/rteval/cyclictest/core/histogram/bucket"
-				 mode="cyclic_histogram_rec_sql"/>
-	  </records>
-	</sqldata>
+        <xsl:apply-templates select="Measurements/Profile/cyclictest" mode="tbl_cyclictest_histogram"/>
       </xsl:when>
 
       <!-- TABLE: hwlatdetect_summary -->
       <xsl:when test="$table = 'hwlatdetect_summary'">
-        <xsl:if test="string(number($rterid)) = 'NaN'">
-          <xsl:message terminate="yes">
-            <xsl:text>Invalid 'rterid' parameter value: </xsl:text><xsl:value-of select="$rterid"/>
-          </xsl:message>
-        </xsl:if>
-	<sqldata schemaver="1.5" table="hwlatdetect_summary">
-	  <fields>
-            <field fid="0">rterid</field>
-            <field fid="1">duration</field>
-            <field fid="2">threshold</field>
-            <field fid="3">timewindow</field>
-            <field fid="4">width</field>
-            <field fid="5">samplecount</field>
-            <field fid="6">hwlat_min</field>
-            <field fid="7">hwlat_avg</field>
-            <field fid="8">hwlat_max</field>
-	  </fields>
-	  <records>
-            <xsl:apply-templates select="/rteval/hwlatdetect[@format='1.0']" mode="summary"/>
-	  </records>
-	</sqldata>
+        <xsl:apply-templates select="Measurements/Profile/hwlatdetect" mode="tbl_hwlatdetect_summary"/>
       </xsl:when>
 
       <!-- TABLE: hwlatdetect_samples -->
       <xsl:when test="$table = 'hwlatdetect_samples'">
-        <xsl:if test="string(number($rterid)) = 'NaN'">
-          <xsl:message terminate="yes">
-            <xsl:text>Invalid 'rterid' parameter value: </xsl:text><xsl:value-of select="$rterid"/>
-          </xsl:message>
-        </xsl:if>
-	<sqldata schemaver="1.5" table="hwlatdetect_samples">
-	  <fields>
-            <field fid="0">rterid</field>
-            <field fid="1">timestamp</field>
-            <field fid="2">latency</field>
-	  </fields>
-	  <records>
-            <xsl:apply-templates select="/rteval/hwlatdetect[@format='1.0']/samples/sample" mode="samples"/>
-	  </records>
-	</sqldata>
+        <xsl:apply-templates select="Measurements/Profile/hwlatdetect/samples" mode="tbl_hwlatdetect_samples"/>
+      </xsl:when>
+
+      <!-- TABLE: cyclic_rawdata - only used by rteval v1.4 and earlier -->
+      <xsl:when test="$table = 'cyclic_rawdata'"> <!-- Just ignore this one - avoids parsing warnings -->
       </xsl:when>
 
       <xsl:otherwise>
@@ -338,7 +159,362 @@
     </xsl:choose>
   </xsl:template>
 
-  <xsl:template match="/rteval/cyclictest/system/histogram/bucket|/rteval/cyclictest/core/histogram/bucket"
+
+
+
+
+  <!-- TABLE: systems - all rteval versions -->
+  <xsl:template match="/rteval['2.0' > @version]/HardwareInfo|/rteval[@version >= '2.0']/SystemInfo/DMIinfo/HardwareInfo" mode="tbl_systems">
+    <sqldata schemaver="1.0" table="systems" key="syskey">
+      <fields>
+        <field fid="0">sysid</field>
+        <field fid="1">dmidata</field>
+      </fields>
+      <records>
+        <record>
+          <value fid="0" hash="sha1">
+            <xsl:value-of select="concat(@SystemUUID,':',@SerialNo)"/>
+          </value>
+          <value fid="1" type="xmlblob">
+            <xsl:copy-of select="."/>
+          </value>
+        </record>
+      </records>
+    </sqldata>
+  </xsl:template>
+
+
+
+  <!-- TABLE: systems_hostname - rteval v1.37 or older -->
+  <xsl:template match="/rteval['2.0' > @version]" mode="tbl_systems_hostname">
+    <xsl:if test="string(number($syskey)) = 'NaN'">
+      <xsl:message terminate="yes">
+        <xsl:text>Invalid 'syskey' parameter value: </xsl:text><xsl:value-of select="syskey"/>
+      </xsl:message>
+    </xsl:if>
+    <sqldata schemaver="1.0" table="systems_hostname">
+      <xsl:call-template name="fields_systems_hostname"/>
+      <records>
+        <record>
+          <value fid="0"><xsl:value-of select="$syskey"/></value>
+          <value fid="1"><xsl:value-of select="uname/node"/></value>
+          <value fid="2"><xsl:value-of select="network_config/interface/IPv4[@defaultgw=1]/@ipaddr"/></value>
+        </record>
+      </records>
+    </sqldata>
+  </xsl:template>
+
+  <!-- TABLE: systems_hostname - rteval v2.0 or newer -->
+  <xsl:template match="/rteval[@version >= '2.0']/SystemInfo" mode="tbl_systems_hostname">
+    <xsl:if test="string(number($syskey)) = 'NaN'">
+      <xsl:message terminate="yes">
+        <xsl:text>Invalid 'syskey' parameter value: </xsl:text><xsl:value-of select="syskey"/>
+      </xsl:message>
+    </xsl:if>
+    <sqldata schemaver="1.0" table="systems_hostname">
+      <xsl:call-template name="fields_systems_hostname"/>
+      <records>
+        <record>
+          <value fid="0"><xsl:value-of select="$syskey"/></value>
+          <value fid="1"><xsl:value-of select="uname/node"/></value>
+          <value fid="2"><xsl:value-of select="NetworkConfig/interface/IPv4[@defaultgw=1]/@ipaddr"/></value>
+        </record>
+      </records>
+    </sqldata>
+  </xsl:template>
+
+  <xsl:template name="fields_systems_hostname">
+    <fields>
+      <field fid="0">syskey</field>
+      <field fid="1">hostname</field>
+      <field fid="2">ipaddr</field>
+    </fields>
+  </xsl:template>
+
+
+
+  <!-- TABLE: rtevalruns - rteval v1.37 or older -->
+  <xsl:template match="/rteval['2.0' > @version]" mode="tbl_rtevalruns">
+    <sqldata schemaver="1.2" table="rtevalruns">
+      <xsl:call-template name="fields_rtevalruns"/>
+      <records>
+        <record>
+          <value fid="0"><xsl:value-of select="$syskey"/></value>
+          <value fid="1"><xsl:value-of select="uname/kernel"/></value>
+          <value fid="2"><xsl:choose>
+            <xsl:when test="uname/kernel/@is_RT = '1'">true</xsl:when>
+            <xsl:otherwise>false</xsl:otherwise></xsl:choose>
+          </value>
+          <value fid="3"><xsl:value-of select="uname/arch"/></value>
+          <value fid="4"><xsl:value-of select="concat(run_info/date, ' ', run_info/time)"/></value>
+          <value fid="5">
+            <xsl:value-of select="(run_info/@days*86400)+(run_info/@hours*3600)
+                                  +(run_info/@minutes*60)+(run_info/@seconds)"/>
+          </value>
+          <value fid="6"><xsl:value-of select="loads/@load_average"/></value>
+          <value fid="7"><xsl:value-of select="@version"/></value>
+          <value fid="8"><xsl:value-of select="$report_filename"/></value>
+          <value fid="9"><xsl:value-of select="$rterid"/></value>
+          <value fid="10"><xsl:value-of select="$submid"/></value>
+          <value fid="11"><xsl:value-of select="uname/baseos"/></value>
+        </record>
+      </records>
+    </sqldata>
+  </xsl:template>
+
+  <!-- TABLE: rtevalruns - rteval v2.0 or newer -->
+  <xsl:template match="/rteval[@version >= '2.0']" mode="tbl_rtevalruns">
+    <sqldata schemaver="1.2" table="rtevalruns">
+      <xsl:call-template name="fields_rtevalruns"/>
+      <records>
+        <record>
+          <value fid="0"><xsl:value-of select="$syskey"/></value>
+          <value fid="1"><xsl:value-of select="SystemInfo/uname/kernel"/></value>
+          <value fid="2"><xsl:choose>
+            <xsl:when test="SystemInfo/uname/kernel/@is_RT = '1'">true</xsl:when>
+            <xsl:otherwise>false</xsl:otherwise></xsl:choose>
+          </value>
+          <value fid="3"><xsl:value-of select="SystemInfo/uname/arch"/></value>
+          <value fid="4"><xsl:value-of select="concat(run_info/date, ' ', run_info/time)"/></value>
+          <value fid="5">
+            <xsl:value-of select="(run_info/@days*86400)+(run_info/@hours*3600)
+                                  +(run_info/@minutes*60)+(run_info/@seconds)"/>
+          </value>
+          <value fid="6"><xsl:value-of select="loads/@load_average"/></value>
+          <value fid="7"><xsl:value-of select="@version"/></value>
+          <value fid="8"><xsl:value-of select="$report_filename"/></value>
+          <value fid="9"><xsl:value-of select="$rterid"/></value>
+          <value fid="10"><xsl:value-of select="$submid"/></value>
+          <value fid="11"><xsl:value-of select="SystemInfo/uname/baseos"/></value>
+        </record>
+      </records>
+    </sqldata>
+  </xsl:template>
+
+  <xsl:template name="fields_rtevalruns">
+    <xsl:if test="string(number($syskey)) = 'NaN'">
+      <xsl:message terminate="yes">
+        <xsl:text>Invalid 'syskey' parameter value: </xsl:text><xsl:value-of select="syskey"/>
+      </xsl:message>
+    </xsl:if>
+    <xsl:if test="string(number($rterid)) = 'NaN'">
+      <xsl:message terminate="yes">
+        <xsl:text>Invalid 'rterid' parameter value: </xsl:text><xsl:value-of select="$rterid"/>
+      </xsl:message>
+    </xsl:if>
+    <xsl:if test="string(number($submid)) = 'NaN'">
+      <xsl:message terminate="yes">
+        <xsl:text>Invalid 'submid' parameter value: </xsl:text><xsl:value-of select="$rterid"/>
+      </xsl:message>
+    </xsl:if>
+    <xsl:if test="$report_filename = ''">
+      <xsl:message terminate="yes">
+        <xsl:text>The parameter 'report_filename' parameter cannot be empty</xsl:text>
+      </xsl:message>
+    </xsl:if>
+      <fields>
+        <field fid="0">syskey</field>
+        <field fid="1">kernel_ver</field>
+        <field fid="2">kernel_rt</field>
+        <field fid="3">arch</field>
+        <field fid="4">run_start</field>
+        <field fid="5">run_duration</field>
+        <field fid="6">load_avg</field>
+        <field fid="7">version</field>
+        <field fid="8">report_filename</field>
+        <field fid="9">rterid</field>
+        <field fid="10">submid</field>
+        <field fid="11">distro</field>
+      </fields>
+  </xsl:template>
+
+
+
+  <!-- TABLE: rtevalruns_details - rteval v1.37 or older -->
+  <xsl:template match="/rteval['2.0' > @version]" mode="tbl_rtevalruns_details">
+    <sqldata schemaver="1.4" table="rtevalruns_details">
+      <xsl:call-template name="fields_rtevalruns_details"/>
+      <records>
+        <record>
+          <value fid="0"><xsl:value-of select="$rterid"/></value>
+          <value fid="1"><xsl:value-of select="hardware/numa_nodes"/></value>
+          <value fid="2">
+            <xsl:choose>
+              <xsl:when test="hardware/cpu_topology">
+                <xsl:value-of select="hardware/cpu_topology/@num_cpu_cores"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:value-of select="hardware/cpu_cores"/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </value>
+          <value fid="3">
+            <xsl:value-of select="hardware/cpu_topology/@num_cpu_sockets"/>
+          </value>
+          <value fid="4" type="xmlblob">
+            <rteval_details>
+              <xsl:copy-of select="clocksource|services|kthreads|network_config|loads|cyclictest/command_line"/>
+              <hardware>
+                <xsl:copy-of select="hardware/memory_size|hardware/cpu_topology"/>
+              </hardware>
+            </rteval_details>
+          </value>
+          <value fid="5"><xsl:value-of select="run_info/annotate"/></value>
+          <value fid="6" type="array">
+            <xsl:for-each select="hardware/cpu_topology/cpu[generate-id() = generate-id(key('pkgkey', @physical_package_id)[1])]">
+              <xsl:call-template name="count_core_spread_v1x">
+                <xsl:with-param name="pkgid" select="@physical_package_id"/>
+              </xsl:call-template>
+            </xsl:for-each>
+          </value>
+        </record>
+      </records>
+    </sqldata>
+  </xsl:template>
+
+  <!-- TABLE: rtevalruns_details - rteval v2.0 or newer -->
+  <xsl:template match="/rteval[@version >= '2.0']/SystemInfo" mode="tbl_rtevalruns_details">
+    <sqldata schemaver="1.4" table="rtevalruns_details">
+      <xsl:call-template name="fields_rtevalruns_details"/>
+      <records>
+        <record>
+          <value fid="0"><xsl:value-of select="$rterid"/></value>
+          <value fid="1"><xsl:value-of select="Memory/numa_nodes"/></value>
+          <value fid="2">
+            <xsl:value-of select="CPUtopology/@num_cpu_cores"/>
+          </value>
+          <value fid="3">
+            <xsl:value-of select="CPUtopology/@num_cpu_sockets"/>
+          </value>
+          <value fid="4" type="xmlblob">
+            <rteval_details format="2">
+              <xsl:copy-of select="Kernel/ClockSource|Services|Kernel/kthreads|NetworkConfig"/>
+              <xsl:copy-of select="../loads"/>
+              <Measurement>
+                <xsl:for-each select="../Measurements/Profile/*">
+                  <module>
+                    <xsl:attribute name="name"><xsl:value-of select="name(.)"/></xsl:attribute>
+                    <xsl:if test="@command_line">
+                      <command_line><xsl:value-of select="@command_line"/></command_line>
+                    </xsl:if>
+                  </module>
+                </xsl:for-each>
+              </Measurement>
+              <hardware>
+                <xsl:copy-of select="Memory|CPUtopology"/>
+              </hardware>
+            </rteval_details>
+          </value>
+          <value fid="5"><xsl:value-of select="../run_info/annotate"/></value>
+          <value fid="6" type="array">
+            <xsl:for-each select="CPUtopology/cpu[generate-id() = generate-id(key('pkgkey', @physical_package_id)[1])]">
+              <xsl:call-template name="count_core_spread_v2x">
+                <xsl:with-param name="pkgid" select="@physical_package_id"/>
+              </xsl:call-template>
+            </xsl:for-each>
+          </value>
+        </record>
+      </records>
+    </sqldata>
+  </xsl:template>
+
+  <xsl:template name="fields_rtevalruns_details">
+    <xsl:if test="string(number($rterid)) = 'NaN'">
+      <xsl:message terminate="yes">
+        <xsl:text>Invalid 'rterid' parameter value: </xsl:text><xsl:value-of select="$rterid"/>
+      </xsl:message>
+    </xsl:if>
+    <fields>
+      <field fid="0">rterid</field>
+      <field fid="1">numa_nodes</field>
+      <field fid="2">num_cpu_cores</field>
+      <field fid="3">num_cpu_sockets</field>
+      <field fid="4">xmldata</field>
+      <field fid="5">annotation</field>
+      <field fid="6">cpu_core_spread</field>
+    </fields>
+  </xsl:template>
+
+
+
+  <!-- TABLE: cyclic_statistics - rteval - all version -->
+  <xsl:template match="/rteval['2.0' > @version]/cyclictest|/rteval[@version >= '2.0']/Measurements/Profile/cyclictest"
+                mode="tbl_cyclictest_statistics">
+    <xsl:if test="string(number($rterid)) = 'NaN'">
+      <xsl:message terminate="yes">
+        <xsl:text>Invalid 'rterid' parameter value: </xsl:text><xsl:value-of select="$rterid"/>
+      </xsl:message>
+    </xsl:if>
+    <sqldata schemaver="1.1" table="cyclic_statistics">
+      <fields>
+        <field fid="0">rterid</field>
+        <field fid="1">coreid</field>
+        <field fid="2">priority</field>
+        <field fid="3">num_samples</field>
+        <field fid="4">lat_min</field>
+        <field fid="5">lat_max</field>
+        <field fid="6">lat_mean</field>
+        <field fid="7">mode</field>
+        <field fid="8">range</field>
+        <field fid="9">median</field>
+        <field fid="10">stddev</field>
+        <field fid="11">mean_abs_dev</field>
+        <field fid="12">variance</field>
+      </fields>
+      <records>
+        <xsl:for-each select="core/statistics|system/statistics">
+          <record>
+            <value fid="0"><xsl:value-of select="$rterid"/></value>
+            <value fid="1"><xsl:choose>
+              <xsl:when test="../@id"><xsl:value-of select="../@id"/></xsl:when>
+              <xsl:otherwise><xsl:attribute name="isnull">1</xsl:attribute></xsl:otherwise></xsl:choose>
+            </value>
+            <value fid="2"><xsl:choose>
+              <xsl:when test="../@priority"><xsl:value-of select="../@priority"/></xsl:when>
+              <xsl:otherwise><xsl:attribute name="isnull">1</xsl:attribute></xsl:otherwise></xsl:choose>
+            </value>
+            <value fid="3"><xsl:value-of select="samples"/></value>
+            <value fid="4"><xsl:value-of select="minimum"/></value>
+            <value fid="5"><xsl:value-of select="maximum"/></value>
+            <value fid="6"><xsl:value-of select="median"/></value>
+            <value fid="7"><xsl:value-of select="mode"/></value>
+            <value fid="8"><xsl:value-of select="range"/></value>
+            <value fid="9"><xsl:value-of select="mean"/></value>
+            <value fid="10"><xsl:value-of select="standard_deviation"/></value>
+            <value fid="11"><xsl:value-of select="mean_absolute_deviation"/></value>
+            <value fid="12"><xsl:value-of select="variance"/></value>
+          </record>
+        </xsl:for-each>
+      </records>
+    </sqldata>
+  </xsl:template>
+
+
+
+  <!-- TABLE: cyclic_histogram - rteval - all version -->
+  <xsl:template match="/rteval['2.0' > @version]/cyclictest|/rteval[@version >= '2.0']/Measurements/Profile/cyclictest"
+                mode="tbl_cyclictest_histogram">
+    <xsl:if test="string(number($rterid)) = 'NaN'">
+      <xsl:message terminate="yes">
+        <xsl:text>Invalid 'rterid' parameter value: </xsl:text><xsl:value-of select="$rterid"/>
+      </xsl:message>
+    </xsl:if>
+    <sqldata schemaver="1.0" table="cyclic_histogram">
+      <fields>
+        <field fid="0">rterid</field>
+        <field fid="1">core</field>
+        <field fid="2">index</field>
+        <field fid="3">value</field>
+      </fields>
+      <records>
+        <!-- Do it in this order, so the overall system results are parsed first -->
+        <xsl:apply-templates select="./system/histogram/bucket" mode="cyclic_histogram_rec_sql"/>
+        <xsl:apply-templates select="./core/histogram/bucket" mode="cyclic_histogram_rec_sql"/>
+      </records>
+    </sqldata>
+  </xsl:template>
+
+  <xsl:template match="/rteval['2.0' > @version]/cyclictest/*/histogram/bucket|/rteval[@version >= '2.0']/Measurements/Profile/cyclictest/*/histogram/bucket"
 		mode="cyclic_histogram_rec_sql">
       <record>
 	<value fid="0"><xsl:value-of select="$rterid"/></value>
@@ -348,21 +524,74 @@
       </record>
   </xsl:template>
 
-  <xsl:template match="/rteval/hwlatdetect[@format='1.0']" mode="summary">
-    <record>
-      <value fid="0"><xsl:value-of select="$rterid"/></value>
-      <value fid="1"><xsl:value-of select="RunParams/@duration"/></value>
-      <value fid="2"><xsl:value-of select="RunParams/@threshold"/></value>
-      <value fid="3"><xsl:value-of select="RunParams/@window"/></value>
-      <value fid="4"><xsl:value-of select="RunParams/@width"/></value>
-      <value fid="5"><xsl:value-of select="samples/@count"/></value>
-      <value fid="6"><xsl:value-of select="math:min(samples/sample/@duration)"/></value>
-      <value fid="7"><xsl:value-of select="sum(samples/sample/@duration) div samples/@count"/></value>
-      <value fid="8"><xsl:value-of select="math:max(samples/sample/@duration)"/></value>
-    </record>
+
+
+  <!-- TABLE: hwlatdetect_summar - only for rteval 2.0 and newer -->
+  <xsl:template match="/rteval[@version >= '2.0']/Measurements/Profile/hwlatdetect" mode="tbl_hwlatdetect_summary">
+    <xsl:if test="string(number($rterid)) = 'NaN'">
+      <xsl:message terminate="yes">
+        <xsl:text>Invalid 'rterid' parameter value: </xsl:text><xsl:value-of select="$rterid"/>
+      </xsl:message>
+    </xsl:if>
+    <sqldata schemaver="1.5" table="hwlatdetect_summary">
+      <fields>
+        <field fid="0">rterid</field>
+        <field fid="1">duration</field>
+        <field fid="2">threshold</field>
+        <field fid="3">timewindow</field>
+        <field fid="4">width</field>
+        <field fid="5">samplecount</field>
+        <field fid="6">hwlat_min</field>
+        <field fid="7">hwlat_avg</field>
+        <field fid="8">hwlat_max</field>
+      </fields>
+      <records>
+        <record>
+          <value fid="0"><xsl:value-of select="$rterid"/></value>
+          <value fid="1"><xsl:value-of select="RunParams/@duration"/></value>
+          <value fid="2"><xsl:value-of select="RunParams/@threshold"/></value>
+          <value fid="3"><xsl:value-of select="RunParams/@window"/></value>
+          <value fid="4"><xsl:value-of select="RunParams/@width"/></value>
+          <value fid="5"><xsl:value-of select="samples/@count"/></value>
+          <xsl:choose>
+            <xsl:when test="samples/@count > 0">
+              <value fid="6"><xsl:value-of select="math:min(samples/sample/@duration)"/></value>
+              <value fid="7"><xsl:value-of select="sum(samples/sample/@duration) div samples/@count"/></value>
+              <value fid="8"><xsl:value-of select="math:max(samples/sample/@duration)"/></value>
+            </xsl:when>
+            <xsl:otherwise>
+              <value fid="6">0</value>
+              <value fid="7">0</value>
+              <value fid="8">0</value>
+            </xsl:otherwise>
+          </xsl:choose>
+        </record>
+      </records>
+    </sqldata>
+  </xsl:template>
+
+
+
+  <!-- TABLE: hwlatdetect_samples - only for rteval 2.0 and newer -->
+  <xsl:template match="/rteval[@version >='2.0']/Measurements/Profile/hwlatdetect/samples" mode="tbl_hwlatdetect_samples">
+    <xsl:if test="string(number($rterid)) = 'NaN'">
+      <xsl:message terminate="yes">
+        <xsl:text>Invalid 'rterid' parameter value: </xsl:text><xsl:value-of select="$rterid"/>
+      </xsl:message>
+    </xsl:if>
+    <sqldata schemaver="1.5" table="hwlatdetect_samples">
+      <fields>
+        <field fid="0">rterid</field>
+        <field fid="1">timestamp</field>
+        <field fid="2">latency</field>
+      </fields>
+      <records>
+        <xsl:apply-templates select="sample" mode="hwlatdetect_samples"/>
+      </records>
+    </sqldata>
   </xsl:template>
 
-  <xsl:template match="/rteval/hwlatdetect[@format='1.0']/samples/sample" mode="samples">
+  <xsl:template match="/rteval[@version >='2.0']/Measurements/Profile/hwlatdetect[@format='1.0']/samples/sample" mode="hwlatdetect_samples">
     <record>
       <value fid="0"><xsl:value-of select="$rterid"/></value>
       <value fid="1"><xsl:value-of select="@timestamp"/></value>
@@ -370,12 +599,23 @@
     </record>
   </xsl:template>
 
-  <!-- Helper "function" for generating a core per physical socket spread overview -->
-  <xsl:template name="count_core_spread">
+
+
+
+  <!-- Helper "function" for generating a core per physical socket spread overview - for rteval v1.37 or older -->
+  <xsl:template name="count_core_spread_v1x">
     <xsl:param name="pkgid"/>
     <value>
       <xsl:value-of select="count(/rteval/hardware/cpu_topology/cpu[@physical_package_id = $pkgid])"/>
     </value>
   </xsl:template>
 
+  <!-- Helper "function" for generating a core per physical socket spread overview - for rteval v2.0 or newer -->
+  <xsl:template name="count_core_spread_v2x">
+    <xsl:param name="pkgid"/>
+    <value>
+      <xsl:value-of select="count(/rteval/SystemInfo/CPUtopology/cpu[@physical_package_id = $pkgid])"/>
+    </value>
+  </xsl:template>
+
 </xsl:stylesheet>