SVN Commit by dpage: r4216 - trunk/pgadmin3/xtra/pgagent

Author: dpage
Date: 2005-05-19 10:53:11 +0100 (Thu, 19 May 2005)
New Revision: 4216

Modified:
trunk/pgadmin3/xtra/pgagent/job.cpp
Log:
Properly reference the job log from the step log

Modified: trunk/pgadmin3/xtra/pgagent/job.cpp
===================================================================
--- trunk/pgadmin3/xtra/pgagent/job.cpp 2005-05-19 09:42:43 UTC (rev 4215)
+++ trunk/pgadmin3/xtra/pgagent/job.cpp 2005-05-19 09:53:11 UTC (rev 4216)
@@ -81,16 +81,16 @@
while (steps->HasData())
{
DBconn *conn;
- string jpsid, jpecode;
+ string jslid, jpecode;

DBresult *id=serviceConn->Execute(
"SELECT nextval('pgagent.pga_jobsteplog_jslid_seq') AS id");
if (id)
{
- jpsid=id->GetString("id");
+ jslid=id->GetString("id");
DBresult *res=serviceConn->Execute(
"INSERT INTO pgagent.pga_jobsteplog(jslid, jsljlgid, jslstatus) "
- "SELECT " + jpsid + ", " + jobid + ", 'r'"
+ "SELECT " + jslid + ", " + logid + ", 'r'"
" FROM pgagent.pga_jobstep WHERE jstid=" + steps->GetString("jstid"));

if (res)
@@ -146,7 +146,7 @@
"UPDATE pgagent.pga_jobsteplog "
" SET jslduration = now() - jslstart, "
" jslresult = " + NumToStr(rc) + ", jslstatus = '" + stepstatus + "' "
- " WHERE jslid=" + jpsid);
+ " WHERE jslid=" + jslid);
if (rc != 1 || stepstatus == "f")
{
status = 'f';