From e7848c2d61bb8fb13b4620ba0c8eaf20a1965ffa Mon Sep 17 00:00:00 2001
From: Jeffrey Armstrong <jeff@approximatrix.com>
Date: Thu, 6 May 2021 16:04:47 -0400
Subject: Check for results existence works in CGI interface for listing tasks

---
 captain/web.f90 | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'captain')

diff --git a/captain/web.f90 b/captain/web.f90
index 3ac260a..423f7ed 100644
--- a/captain/web.f90
+++ b/captain/web.f90
@@ -83,7 +83,7 @@ contains
         
         type(task), dimension(:), pointer::tasks
         character(32)::task_text, job_text
-        character(len=:), pointer::task_results_filename, one_link
+        character(len=:), pointer::task_results_filename, one_link, local_task_results_filename
         
         logical::file_exists
         
@@ -114,8 +114,8 @@ contains
                 do i = 1, size(tasks)
                     status = get_status_utf8(tasks(i)%status)
                     task_results_filename => get_task_result_static_filename(one_job%id, i, no_path=.true.)
-                    
-                    inquire(file=task_results_filename, exist=file_exists)
+                    local_task_results_filename => get_task_result_static_filename(one_job%id, i, no_path=.false.)
+                    inquire(file=local_task_results_filename, exist=file_exists)
                     
                     write(task_text, '(I8)') i
                     
@@ -126,9 +126,11 @@ contains
                         res = trim(res)//nl//"    <li>"//trim(one_link)//"</li>"
                         deallocate(one_link)
                     else
-                        res = trim(res)//nl//"    <li>"//trim(status)//" - Task "//trim(adjustl(task_text))//"</li>"
+                        res = trim(res)//nl//"    <li>"// &
+                              trim(status)//" - Task "//trim(adjustl(task_text))//"</li>"
                     end if
                     
+                    deallocate(local_task_results_filename)
                     deallocate(task_results_filename)
                 end do
                 res = trim(res)//nl//"</ul>"
-- 
cgit v1.2.3