diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py index 46a50d5bce207103ae14be77b71c3535266cd041..4ed7164f24cd2017fd4118bab319df089e697a9f 100644 --- a/atdb/taskdatabase/services/algorithms.py +++ b/atdb/taskdatabase/services/algorithms.py @@ -3,7 +3,7 @@ Author: Nico Vermaas - Astron Description: Business logic for ATDB. These functions are called from the views (views.py). """ -import json +import requests from datetime import datetime, timedelta from django.db.models import Q, Sum import logging @@ -708,6 +708,7 @@ def construct_inspectionplots(task,source='task_id'): url = surl.replace(translation[0],translation[1]) results += '<tr><td><a href="' + url + '" target="_blank">'+ basename + '</a></td></tr>' + if basename.endswith('png'): results += '<tr><td><a href="' + url + '" target="_blank"><img width="800" src="' + url + '" alt="' + basename + '"/></a></td></tr>' @@ -747,6 +748,12 @@ def construct_inspectionplots(task,source='task_id'): results += '<tr><td><a href="' + url + '" target="_blank">' + basename + '</a></td></tr>' if basename.endswith('png'): + # retrieve and evaluate the url first + response = requests.get(url) + if response.status_code!=200: + # try again + logger.error(response) + results += '<tr><td><a href="' + url + '" target="_blank"><img width="800" src="' + url + '" alt="'+basename+'"/></a></td></tr>' plot_files.append(plot_file) diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index b185799794fd22de63ac7be4437e817f7246c119..f516f91ee4be24970e52b181d6cc252b628bc7bf 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.html @@ -34,7 +34,7 @@ {% include 'taskdatabase/pagination.html' %} </div> </div> - <p class="footer"> Version 6 April 2023 + <p class="footer"> Version 14 April 2023 </div>