From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Fri, 17 Aug 2012 14:21:55 +0000 (+0000)
Subject: Include job type information in HTML output.
X-Git-Tag: glite-jobid-api-c_R_2_2_2_1~25
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=e518d8240d0bd208f9e894fbf7ae0500260f75ac;p=jra1mw.git

Include job type information in HTML output.
---

diff --git a/org.glite.lb.server/src/lb_html.c b/org.glite.lb.server/src/lb_html.c
index dd5bf6f..700ece7 100644
--- a/org.glite.lb.server/src/lb_html.c
+++ b/org.glite.lb.server/src/lb_html.c
@@ -322,6 +322,7 @@ int edg_wll_GeneralJobStatusToHTML(edg_wll_Context ctx UNUSED_VAR, edg_wll_JobSt
 	TRL("Parent job", "%s", chpa, NULL);
 	TR("Status","%s",(chstat = edg_wll_StatToString(stat.state)), NULL);
 	free(chstat);
+	TR("Type","%s",edg_wll_StatusJobtypeNames[stat.jobtype], NULL);
 	TR("Owner","%s",stat.owner, NULL);
 	TR("Payload Owner","%s",stat.payload_owner, NULL);
 	TR("Condor Id","%s",stat.condorId, NULL);
@@ -415,6 +416,7 @@ int edg_wll_CreamJobStatusToHTML(edg_wll_Context ctx UNUSED_VAR, edg_wll_JobStat
 	free(lbstat);
 	TR("CREAM Status", "%s", (creamstat = edg_wll_CreamStatToString(stat.cream_state)), NULL);
 	free(creamstat);
+	TR("Type","%s",edg_wll_StatusJobtypeNames[stat.jobtype], NULL);
 	TR("Owner", "%s", stat.cream_owner, NULL);
 	TR("Endpoint", "%s", stat.cream_endpoint, NULL);
 	TR("Worker node", "%s", stat.cream_node, NULL);
@@ -482,6 +484,7 @@ int edg_wll_FileTransferStatusToHTML(edg_wll_Context ctx UNUSED_VAR, edg_wll_Job
 
 	TR("Status", "%s", (lbstat = edg_wll_StatToString(stat.state)), NULL);
 	free(lbstat);
+	TR("Type","%s",edg_wll_StatusJobtypeNames[stat.jobtype], NULL);
         TR("Owner","%s",stat.owner, NULL);
 	chcj = edg_wlc_JobIdUnparse(stat.ft_compute_job);
 	TRL("Compute job", "%s", chcj, NULL);
diff --git a/org.glite.lb.server/src/lb_text.c b/org.glite.lb.server/src/lb_text.c
index 31d6536..d4596a5 100644
--- a/org.glite.lb.server/src/lb_text.c
+++ b/org.glite.lb.server/src/lb_text.c
@@ -180,6 +180,7 @@ int edg_wll_JobStatusToText(edg_wll_Context ctx UNUSED_VAR, edg_wll_JobStat stat
 
 	TR("Status","%s",(chstat = edg_wll_StatToString(stat.state)));
 	free(chstat);
+	TR("type","%s",edg_wll_StatusJobtypeNames[stat.jobtype]);
 	TR("owner","%s",stat.owner);
 	TR("payload_owner","%s",stat.payload_owner);
 	TR("condorId","%s",stat.condorId);