use different srm_to_url translation when plots are moved

atdb/taskdatabase/services/algorithms.py

@@ -684,9 +684,33 @@ def add_plots(task, token, translation, results, expand_image="False"):
     # keep a temporary list of filenames to check uniqueness
     plot_files = []
 
+    # translate the path to a url for the original plots location
+    try:
+        srm_to_url = Configuration.objects.get(key='dcache:srm_to_url').value
+    except:
+        srm_to_url = "srm://srm.grid.sara.nl/pnfs/grid.sara.nl/data/lofar/ops/disk/ldv/::https://webdav.grid.surfsara.nl/"
+
+    # translate the path to a url for when the plots are moved by the archiver
+    try:
+        srm_to_url_archive_disk = Configuration.objects.get(key='dcache:srm_to_url_archive_disk').value
+    except:
+        srm_to_url_archive_disk = "srm://srm.grid.sara.nl/pnfs/grid.sara.nl/data/lofar/ops/disk/projects/::https://webdav.grid.surfsara.nl/projects/"
+
+
     plots = task.quality_json["plots"]
     count = 0
+
     for plot in plots:
+        # check where the plot lives and provide the translation
+        try:
+            # is the plot already moved to its final location on disk in the lta?
+            base_surl = plot['surl_lta']
+            translation = srm_to_url_archive_disk.split("::")
+        except:
+            # assume the orignal location.
+            base_surl = plot['surl']
+            translation = srm_to_url.split("::")
+
         basename = plot['basename']
         checksum = plot['checksum']
         # plot_file = basename + str(plot['size'])
@@ -695,8 +719,7 @@ def add_plots(task, token, translation, results, expand_image="False"):
         # only add unique files
         if not plot_file in plot_files:
             count = count + 1
-            surl = plot['surl'] + "?action=show&authz=" + str(token)
-
+            surl = base_surl + "?action=show&authz=" + str(token)
             url = surl.replace(translation[0], translation[1])
 
             if basename.endswith('png') and expand_image=="True":
@@ -737,20 +760,14 @@ def add_plots(task, token, translation, results, expand_image="False"):
 
 def construct_inspectionplots(task, expand_image="False", source='task_id'):
 
-    # translate the path to a url
-    try:
-        srm_to_url = Configuration.objects.get(key='dcache:srm_to_url').value
-    except:
-        srm_to_url = "srm://srm.grid.sara.nl/pnfs/grid.sara.nl/data/lofar/ops/disk/ldv/::https://webdav.grid.surfsara.nl/"
-
     token = str(Configuration.objects.get(key='dcache:token').value)
-    translation = srm_to_url.split("::")
+
 
     # find the plots in the quality json structure
     if source == 'task_id':
         results = "<h4>Inspection Plots and Summary Logs</h4>"
         results += "<p>Clicking a link will redirect to SURF SARA in a new browser window. </p>"
-        results = add_plots(task, token, translation, results, expand_image)
+        results = add_plots(task, token, results, expand_image)
 
     elif source == 'sas_id':
         sas_id = task.sas_id
@@ -767,7 +784,7 @@ def construct_inspectionplots(task, expand_image="False", source='task_id'):
 
             try:
                 results += '<tr style="background-color:#7EB1C4"><td colspan="3"><b>Task ' + str(task.id) + '</b></td></tr>'
-                results = add_plots(task, token, translation, results, expand_image)
+                results = add_plots(task, token, results, expand_image)
 
             except Exception as error:
                 logger.error(error)
@@ -829,7 +846,7 @@ def construct_summary(task):
                         line += '<tr><td colspan="3">'
                         for filename in added:
                             line += '<tr><td colspan="3">' + filename + '<td></tr>'
-                except Exception as error:
+                except:
                     pass
 
                 try:
@@ -838,13 +855,14 @@ def construct_summary(task):
                         line += '<th>Deleted</th>'
                         for filename in deleted:
                             line += '<tr><td colspan="3">' +filename + '<td></tr>'
-                except Exception as error:
+
+                except:
                     pass
 
                 results += line
 
-        except Exception as error:
-            logger.error(error)
+        except:
+            pass
 
     totals += '<th>Totals</th><th></th><th></th>'
     totals += '<tr><td colspan="2"><b>Input size</b></td><td>' + str(total_size_input) + '</td></tr>'

atdb/taskdatabase/templates/taskdatabase/index.html

@@ -31,7 +31,7 @@
             {% include 'taskdatabase/pagination.html' %}
         </div>
     </div>
-    <p class="footer"> Version 9 May 2023
+    <p class="footer"> Version 10 May 2023
 </div>
 
 {% include 'taskdatabase/refresh.html' %}