diff options
Diffstat (limited to 'captain/web.f90')
| -rw-r--r-- | captain/web.f90 | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/captain/web.f90 b/captain/web.f90 index 1b9bb8f..ccd3df0 100644 --- a/captain/web.f90 +++ b/captain/web.f90 @@ -342,7 +342,8 @@ contains use captain_db use server_response use special_filenames, only: get_task_result_static_filename - use request_utils, only: get_status_utf8 + use request_utils, only: get_status_utf8, get_player_link => player_link, & + get_instruction_link => instruction_link implicit none type(request), intent(in)::req @@ -352,12 +353,12 @@ contains integer::i, j, job_id type(job)::one_job - character(PLAYER_NAME_LENGTH)::player character(1)::nl = new_line(' ') type(task), dimension(:), pointer::tasks character(32)::task_text, job_text character(len=:), pointer::task_results_filename, one_link, local_task_results_filename + character(len=:), pointer::player_link, instruction_link logical::file_exists @@ -376,9 +377,18 @@ contains status = get_status_utf8(one_job%status) res = "<h2>Status - "//status//"</h2>" - call get_player_name(one_job%player, player) - res = trim(res)//nl//nl//"<p><em>Running on "//trim(player)//nl// & - "Last update at: "//one_job%time//"</em></p>" + player_link => get_player_link(one_job%player, .FALSE., prefix="..") + if(associated(player_link)) then + res = trim(res)//nl//nl//"<p><em>Running on "//player_link//nl// & + "Last update at: "//one_job%time//"</em></p>" + deallocate(player_link) + end if + + instruction_link => get_instruction_link(one_job%instruction, .FALSE., prefix="..") + if(associated(instruction_link)) then + res = trim(res)//nl//"<p><em>Executing: "//instruction_link//"</em></p>" + deallocate(instruction_link) + end if res = trim(res)//nl//nl//"<h3>Task Results</h3>" |