2006/unicorn/resources/templates/output en_xhtml10.vm,1.6,1.7

Update of /sources/public/2006/unicorn/resources/templates/output
In directory hutz:/tmp/cvs-serv9703/resources/templates/output

Modified Files:
	en_xhtml10.vm 
Log Message:
simplified observationresponse and generalize output format (now we can map a format type what defnied in the contract to a ResponseParser)

Index: en_xhtml10.vm
===================================================================
RCS file: /sources/public/2006/unicorn/resources/templates/output/en_xhtml10.vm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- en_xhtml10.vm	6 Sep 2006 06:01:24 -0000	1.6
+++ en_xhtml10.vm	21 Feb 2008 14:30:01 -0000	1.7
@@ -75,44 +75,33 @@
 #end
 
 #macro(produceErrors $errors)
-  #foreach($errorList in $errors.Errorlist)
-    <h3>Location: $errorList.Uri</h3>
     <ol class="error_list">
-    #foreach($error in $errorList.Error)
+    #foreach($error in $errors)
       <li class="msg_err">
         #error($error)
       </li>
     #end
-  </ol>
-  #end
+    </ol>
 #end
 
 #macro(produceWarnings $warnings)
-  #foreach($warningList in $warnings.Warninglist)
-    #if($warningList.Warning && $warningList.Warning.size() != 0)
-      <h3>Location: $warningList.Uri</h3>
       <ol class="warning_list">
-      #foreach($warning in $warningList.Warning)
+      #foreach($warning in $warnings)
         <li class="msg_warn">
           #warning($warning)
         </li>
       #end
       </ol>
-    #end
-  #end
 #end
 
 #macro(produceInfos $infos)
-  #foreach($infoList in $infos.Infolist)
-    <h3>Location: $infoList.Uri</h3>
     <ol class="info_list">
-    #foreach($information in $infoList.Info)
+    #foreach($information in $infos)
       <li class="msg_info">
         #info($information)
       </li>
     #end
     </ol>
-  #end
 #end
 
 <body>
@@ -144,15 +133,30 @@
         $observationName
       #end
       test!</h2>
-      #produceErrors($observation.Result.Errors)
-    #end
-    #if($observation.Result.Informations)
-      #produceInfos($observation.Result.Informations)
+      #foreach($result in $observation.getResultsList())
+        #if(!$result.Errors.isEmpty())
+          <h3><u>Location: $result.Uri</u></h3>
+      	  #produceErrors($result.Errors)
+      	#end
+      #end
     #end
-    #if($observation.Result.Warnings)
-      #produceWarnings($observation.Result.Warnings)
+    
+    
+    #foreach($result in $observation.getResultsList())
+      #if(!$result.Infos.isEmpty() || !$result.Warnings.isEmpty())
+        <h3><u>Location: $result.Uri</u></h3>
+      #end
+  
+      #if(!$result.Infos.isEmpty())
+        #produceInfos($result.Infos)
+      #end
+    
+      #if(!$result.Warnings.isEmpty())
+        #produceWarnings($result.Warnings)
+      #end
     #end
    <hr/>
+   
   #end
 
   #if(!$unicorncall.haveHighPassed())

Received on Thursday, 21 February 2008 14:30:13 UTC