SVN Commit by dpage: r4237 - trunk/pgadmin3/src/agent

Author: dpage
Date: 2005-05-23 16:42:55 +0100 (Mon, 23 May 2005)
New Revision: 4237

Modified:
   trunk/pgadmin3/src/agent/pgaJob.cpp
   trunk/pgadmin3/src/agent/pgaStep.cpp
Log:
Display job step output in stats list.

Modified: trunk/pgadmin3/src/agent/pgaJob.cpp
===================================================================
--- trunk/pgadmin3/src/agent/pgaJob.cpp    2005-05-23 15:40:39 UTC (rev 4236)
+++ trunk/pgadmin3/src/agent/pgaJob.cpp    2005-05-23 15:42:55 UTC (rev 4237)
@@ -180,11 +180,11 @@

         // Add the statistics view columns
         statistics->ClearAll();
-        statistics->AddColumn(_("Run"), 70);
-        statistics->AddColumn(_("Status"), 90);
-        statistics->AddColumn(_("Start time"), 125);
-        statistics->AddColumn(_("End time"), 125);
-        statistics->AddColumn(_("Duration"), 110);
+        statistics->AddColumn(_("Run"), 50);
+        statistics->AddColumn(_("Status"), 60);
+        statistics->AddColumn(_("Start time"), 95);
+        statistics->AddColumn(_("End time"), 95);
+        statistics->AddColumn(_("Duration"), 70);

         pgSet *stats = database->ExecuteSet(sql);
         wxString status;
@@ -210,7 +210,8 @@
                 endTime.ParseDateTime(stats->GetVal(4));

                 long pos=statistics->AppendItem(stats->GetVal(0), status, startTime.Format());
-                statistics->SetItem(pos, 3, endTime.Format());
+                if (stats->GetVal(4).Length() > 0)
+                    statistics->SetItem(pos, 3, endTime.Format());
                 statistics->SetItem(pos, 4, stats->GetVal(3));

                 stats->MoveNext();

Modified: trunk/pgadmin3/src/agent/pgaStep.cpp
===================================================================
--- trunk/pgadmin3/src/agent/pgaStep.cpp    2005-05-23 15:40:39 UTC (rev 4236)
+++ trunk/pgadmin3/src/agent/pgaStep.cpp    2005-05-23 15:42:55 UTC (rev 4237)
@@ -154,6 +154,7 @@
              wxT(", jslstart")
              wxT(", jslduration")
              wxT(", (jslstart + jslduration) AS endtime")
+             wxT(", jsloutput")
              wxT("  FROM pgagent.pga_jobsteplog\n")
              wxT(" WHERE jsljstid = ") + NumToStr(GetRecId()) +
              wxT(" ORDER BY jslstart DESC")
@@ -165,12 +166,13 @@

         // Add the statistics view columns
         statistics->ClearAll();
-        statistics->AddColumn(_("Run"), 60);
-        statistics->AddColumn(_("Status"), 90);
-        statistics->AddColumn(_("Result"), 90);
-        statistics->AddColumn(_("Start time"), 125);
-        statistics->AddColumn(_("End time"), 125);
-        statistics->AddColumn(_("Duration"), 110);
+        statistics->AddColumn(_("Run"), 50);
+        statistics->AddColumn(_("Status"), 60);
+        statistics->AddColumn(_("Result"), 60);
+        statistics->AddColumn(_("Start time"), 95);
+        statistics->AddColumn(_("End time"), 95);
+        statistics->AddColumn(_("Duration"), 70);
+        statistics->AddColumn(_("Output"), 200);

         pgSet *stats = database->ExecuteSet(sql);
         wxString status;
@@ -197,8 +199,10 @@

                 long pos=statistics->AppendItem(stats->GetVal(0), status, stats->GetVal(2));
                 statistics->SetItem(pos, 3, startTime.Format());
-                statistics->SetItem(pos, 4, endTime.Format());
+                if (stats->GetVal(5).Length() > 0)
+                    statistics->SetItem(pos, 4, endTime.Format());
                 statistics->SetItem(pos, 5, stats->GetVal(4));
+                statistics->SetItem(pos, 6, stats->GetVal(6));

                 stats->MoveNext();
             }