diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py index 22c32c2a7fb3350729ac6c81c0a7882d5939548c..abcf447f757f6b5663a91893a310d1850d35f11c 100644 --- a/atdb/taskdatabase/services/algorithms.py +++ b/atdb/taskdatabase/services/algorithms.py @@ -664,25 +664,29 @@ def add_plots(task, results, expand_image=False): plot_files = [] # translate the path to a url for the original plots location + # the next four call shoulod use filter=task.service_filter BUT since juelich is no working + # the service_filter is incorrect and we can only use srm.grid.sara.nl + default_filter = "srm.grid.sara.nl" + try: - srm_to_url = Configuration.objects.get(key='dcache:srm_to_url').value + srm_to_url = Configuration.objects.get(filter=default_filter, 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 + srm_to_url_archive_disk = Configuration.objects.get(filter=default_filter, 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/" # retrieve the current tokens for both the original and archived locations try: - token_original = str(Configuration.objects.get(key='dcache:token').value) + token_original = str(Configuration.objects.get(filter=default_filter, key='token:macaroon_disk_ldv').value) except: token_original = '' try: - token_archive_disk = str(Configuration.objects.get(key='dcache:token_archive_disk').value) + token_archive_disk = str(Configuration.objects.get(filter=default_filter, key='token:macaroon_disk_project').value) except: token_archive_disk = ''