diff --git a/templates/da_cache_to_shub.json.j2 b/templates/da_cache_to_shub.json.j2 index 93a3fe5..b6f5367 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:report}" + "scriptExpression": "var k,report={requestid:$.input.request_id,order_number:$.input.order_number,errors:[]},keys=[],errors=[];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&&errors.push({url:$.input.downloads[index].url,number:index,error_number:1002,error_message:o.endpoint1.error}),o.endpoint2.error&&errors.push({url:$.input.descriptor.downloads[index].url,number:index,error_number:9999,error_message:o.endpoint2.error})};report['errors']=Java.to(errors,'java.util.Map[]');return {report:report}" } }, { @@ -205,8 +205,8 @@ "inputParameters" : { "from" : "bluecloud@d4science.org", "to" : "${workflow.input.callback.email}", - "text" : "Dear user,\n your request with id {v1} related to order {v2} number {v3} has completed with the following outcome:\n\n {v4}", - "subject" : "Oucome of Bluecloud DA cache download {v1}", + "html" : "

Dear user,

your request with id {v1} related to order {v2} number {v3} has completed with the following outcome:


{v4}", + "subject" : "Outcome of Bluecloud DA cache download {v1}", "extra_vars":{ "v1" : "${workflow.input.descriptor.request_id}", "v2" : "${workflow.input.descriptor.order_name}",