Skip to content
Snippets Groups Projects
Commit f5e27c43 authored by Nico Vermaas's avatar Nico Vermaas
Browse files

small hotfix

parent 5c593f59
Branches
No related tags found
No related merge requests found
Pipeline #79716 passed
...@@ -150,7 +150,9 @@ def update_activity(task): ...@@ -150,7 +150,9 @@ def update_activity(task):
# only save when changed # only save when changed
if activity.is_processed != current_is_processed: if activity.is_processed != current_is_processed:
# if the whole activity has become processed, then set the status of this activity to 'AGGREGATE' # if the whole activity has become processed, then set the status of this activity to 'AGGREGATE'
# unless it was already aggregated
if (activity.is_processed & non_discarded_found): if (activity.is_processed & non_discarded_found):
if not (activity.is_aggregated):
activity.status = State.AGGREGATE.value activity.status = State.AGGREGATE.value
activity.save() activity.save()
......
...@@ -708,6 +708,8 @@ def add_plots(task, results, expand_image="False"): ...@@ -708,6 +708,8 @@ def add_plots(task, results, expand_image="False"):
count = 0 count = 0
for plot in plots: for plot in plots:
# check where the plot lives and provide the translation # check where the plot lives and provide the translation
try: try:
# is the plot already moved to its final location on disk in the lta? # is the plot already moved to its final location on disk in the lta?
...@@ -716,10 +718,16 @@ def add_plots(task, results, expand_image="False"): ...@@ -716,10 +718,16 @@ def add_plots(task, results, expand_image="False"):
token = token_archive_disk token = token_archive_disk
except: except:
# assume the orignal location. # assume the orignal location.
try:
base_surl = plot['surl'] base_surl = plot['surl']
except:
# this means that the plot names will still show up, but the url won't work
base_url = 'unknown'
translation = srm_to_url.split("::") translation = srm_to_url.split("::")
token = token_original token = token_original
basename = plot['basename'] basename = plot['basename']
checksum = plot['checksum'] checksum = plot['checksum']
# plot_file = basename + str(plot['size']) # plot_file = basename + str(plot['size'])
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
{% include 'taskdatabase/pagination.html' %} {% include 'taskdatabase/pagination.html' %}
</div> </div>
</div> </div>
<p class="footer"> Version 22 Apr 2024 <p class="footer"> Version 23 Apr 2024
</div> </div>
{% include 'taskdatabase/refresh.html' %} {% include 'taskdatabase/refresh.html' %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment