diff -r 35ec0d29a3d8 -r 4dc3b5b1577c common/diamonds/sf-run-analysis.xml.ftl
--- a/common/diamonds/sf-run-analysis.xml.ftl	Fri Aug 14 18:00:38 2009 +0100
+++ b/common/diamonds/sf-run-analysis.xml.ftl	Tue Aug 18 15:32:29 2009 +0100
@@ -3,19 +3,20 @@
 <diamonds-build>
   <schema>10</schema>
   
-<#assign raptor_count=0/>
+<#assign raptor_errors=0/>
+<#assign raptor_warnings=0/>
 <#list raptor_summary as raptor_item>
-<#assign raptor_count=raptor_count+1 />
+<#if raptor_item.category = "raptor_error">
+  <#assign raptor_errors=raptor_errors+1 />
+<#elseif raptor_item.category = "raptor_warning">
+  <#assign raptor_warnings=raptor_warnings+1 />
+</#if>
 </#list>
 
   <faults>
-    <total severity="error">${ant['sf.job.totalyarperrors']}</total>
-    <total severity="warning">0</total>
-    <total severity="warning_rvct_bad">${raptor_count}</total>
-    <total severity="warning_rvct_other">0</total>
-    <total severity="codescanner_high">0</total>
-    <total severity="codescanner_medium">0</total>
-    <total severity="codescanner_low">0</total>
+    <total severity="Raptor Errors">${raptor_errors}</total>
+    <total severity="Raptor Warnings">${raptor_warnings}</total>
+    <total severity="Recipes Failed">${ant['sf.job.totalyarperrors']}</total>
   </faults>
   
   <files>