aboutsummaryrefslogtreecommitdiff
path: root/captain/external.f90
diff options
context:
space:
mode:
Diffstat (limited to 'captain/external.f90')
-rw-r--r--captain/external.f9019
1 files changed, 15 insertions, 4 deletions
diff --git a/captain/external.f90 b/captain/external.f90
index e691dfb..2a0bc23 100644
--- a/captain/external.f90
+++ b/captain/external.f90
@@ -79,7 +79,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
@@ -89,12 +90,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
+ character(len=:), pointer::player_link, instruction_link
res => null()
@@ -111,8 +112,18 @@ contains
status = get_status_utf8(one_job%status)
res = "## Status - "//status
- call get_player_name(one_job%player, player)
- res = trim(res)//nl//nl//"Running on "//trim(player)//nl//"Last update at: "//one_job%time
+ player_link => get_player_link(one_job%player, .TRUE.)
+
+ if(associated(player_link)) then
+ res = trim(res)//nl//nl//"Running on:"//nl//player_link//nl//"Last update at: "//one_job%time
+ deallocate(player_link)
+ end if
+
+ instruction_link => get_instruction_link(one_job%instruction, .TRUE.)
+ if(associated(instruction_link)) then
+ res = trim(res)//nl//"Executing:"//nl//instruction_link
+ deallocate(instruction_link)
+ end if
res = trim(res)//nl//nl//"### Task Results"