From 1394e6570e30529133ed99f26e085e767b862098 Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Thu, 16 Sep 2021 18:25:32 +0200
Subject: [PATCH] fixed report generation

---
 templates/da_cache_to_shub.json.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/da_cache_to_shub.json.j2 b/templates/da_cache_to_shub.json.j2
index 4682f77..9160209 100644
--- a/templates/da_cache_to_shub.json.j2
+++ b/templates/da_cache_to_shub.json.j2
@@ -171,7 +171,7 @@
 					  "inputParameters": {
 						"input" : "${workflow.input.descriptor}",
 						"output" : "${join_parallel_downloads.output}",
-						"scriptExpression": "var k,report={requestid:$.input.request_id,order_number:$.input.order_number,errors:[]},keys=[];for(var k in $.output) keys.push(k);keys.sort();for(k in keys){var index=keys[k].split('_')[1],o=$.output[keys[k]];o.endpoint1.error&&report.errors.push({url:$.input.downloads[index].url,number:index,error_number:1002,error_message:o.endpoint1.error}),o.endpoint2.error&&report.errors.push({url:$.input.descriptor.downloads[index].url,number:index,error_number:9999,error_message:o.endpoint2.error})};return {report:Java.to(keys,'java.lang.String[]')}"
+						"scriptExpression": "var k,report={requestid:$.input.request_id,order_number:$.input.order_number,errors:[]},keys=[];for(var k in $.output) keys.push(k);keys.sort();for(k in keys){var index=keys[k].split('_')[1],o=$.output[keys[k]];o.endpoint1.error&&report.errors.push({url:$.input.downloads[index].url,number:index,error_number:1002,error_message:o.endpoint1.error}),o.endpoint2.error&&report.errors.push({url:$.input.descriptor.downloads[index].url,number:index,error_number:9999,error_message:o.endpoint2.error})};return {report:report}"
 					  }
 					}
 				],
@@ -183,7 +183,7 @@
 					  "inputParameters": {
 						"input" : "${workflow.input.descriptor}",
 						"output" : "${join_parallel_downloads.output}",
-						"scriptExpression": "1 == 1"
+						"scriptExpression": "var k,report='<table><thead><tr><th>Download</th><th>Outcome</th><th>Link</th></tr></thead><tbody>',keys=[];for(var k in $.output) keys.push(k);keys.sort();for(k in keys){var index=keys[k].split('_')[1];report+='<tr><td>'+index+'</td>';var o=$.output[keys[k]];o.endpoint1.error||o.endpoint2.error?report+='<td>'+(o.endpoint1.error||'')+(o.endpoint2.error||'')+'</td>':report+='<td>OK</td>',report+='</tr>'}report+='</tbody></table>';return { report : report}"
 					  }
 					}
 				]