diff --git a/atdb/taskdatabase/services/activities_handler.py b/atdb/taskdatabase/services/activities_handler.py index a5f20e10fa679c5fdcac7b77bf0224a65071cd6f..91b669c9eac44336c55b3d2ed6bd9112d87c03a4 100644 --- a/atdb/taskdatabase/services/activities_handler.py +++ b/atdb/taskdatabase/services/activities_handler.py @@ -150,8 +150,10 @@ def update_activity(task): # only save when changed if activity.is_processed != current_is_processed: # 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): - activity.status = State.AGGREGATE.value + if not (activity.is_aggregated): + activity.status = State.AGGREGATE.value activity.save() diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py index fda6b71f52f25dc8cbf79787b6866722c3a8110b..744af6a9c9c38603ad597dbef7da53196a1d5dc0 100644 --- a/atdb/taskdatabase/services/algorithms.py +++ b/atdb/taskdatabase/services/algorithms.py @@ -708,6 +708,8 @@ def add_plots(task, results, expand_image="False"): 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? @@ -716,10 +718,16 @@ def add_plots(task, results, expand_image="False"): token = token_archive_disk except: # assume the orignal location. - base_surl = plot['surl'] + try: + 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("::") token = token_original + basename = plot['basename'] checksum = plot['checksum'] # plot_file = basename + str(plot['size']) diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index c74ce8b46696261052f5a76bc4eb28f6e2c3f045..5b80acf5ee5697748f4f019e816462f30be36a66 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.html @@ -31,7 +31,7 @@ {% include 'taskdatabase/pagination.html' %} </div> </div> - <p class="footer"> Version 22 Apr 2024 + <p class="footer"> Version 23 Apr 2024 </div> {% include 'taskdatabase/refresh.html' %}