From c05dc1a7e48edaec70024bccb8094c7ed79be1a1 Mon Sep 17 00:00:00 2001 From: dcore94 Date: Thu, 16 Sep 2021 17:27:30 +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 bb353bd..a1b7c17 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=Object.keys($.output).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(report,'java.util.Map[]')}" + "scriptExpression": "1 == 1" } } ], @@ -183,7 +183,7 @@ "inputParameters": { "input" : "${workflow.input.descriptor}", "output" : "${join_parallel_downloads.output}", - "scriptExpression": "var k,report='',keys=Object.keys($.output).sort();for(k in keys){var index=keys[k].split('_')[1];report+='';var o=$.output[keys[k]];o.endpoint1.error||o.endpoint2.error?report+='':report+='',report+=''}report+='
DownloadOutcomeLink
'+index+''+(o.endpoint1.error||'')+(o.endpoint2.error||'')+'OK
';return { report : report}" + "scriptExpression": "2 == 2" } } ]