From 5f786d16d7d2cc2466862281c6e1a35cc7f1d684 Mon Sep 17 00:00:00 2001
From: Ben Roberts <ben@sihnon.net>
Date: Mon, 22 Aug 2011 23:18:57 +0100
Subject: [PATCH] Add control of job log message count and sort order via URL

---
 webui/source/pages/jobs/details.php | 30 +++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/webui/source/pages/jobs/details.php b/webui/source/pages/jobs/details.php
index 86df585..62abd08 100644
--- a/webui/source/pages/jobs/details.php
+++ b/webui/source/pages/jobs/details.php
@@ -1,13 +1,35 @@
 <?php
 
-$job_id = $this->request->get('id');
+$main   = RippingCluster_Main::instance();
+$req    = $main->request();
+$log    = $main->log();
+$config = $main->config();
+
+$job_id = $req->get('id');
 $job = RippingCluster_Job::fromId($job_id);
 $this->smarty->assign('job', $job);
 
-$log = RippingCluster_Main::instance()->log();
+// Fetch log entries for this job
+$log_count = $req->get('logs', $config->get('job.logs.default_display_count'));
+
+$default_log_order = $config->get('job.logs.default_order');
+$log_order = $req->get('order', $default_log_order);
+if ( ! in_array($log_order, array(SihnonFramework_Log::ORDER_ASC, SihnonFramework_Log::ORDER_DESC))) {
+    $log_order = $default_log_order;    
+}
+
+$client_log_entries = array();
+$worker_log_entries = array();
+
+if ($log_count == 'all') {
+    $log_count = '18446744073709551615'; // see mysql man page for LIMIT
+} else if(!is_int($log_count)) {
+    $log_count = $config->get('job.logs.default_display_count');
+} 
+
+$client_log_entries = RippingCluster_LogEntry::recentEntriesByField($log, 'webui', 'job_id', $job_id, 'ctime', $log_order, $log_count);
+$worker_log_entries = RippingCluster_LogEntry::recentEntriesByField($log, 'worker', 'job_id', $job_id, 'ctime', $log_order, $log_count);
 
-$client_log_entries = RippingCluster_LogEntry::recentEntriesByField($log, 'webui', 'job_id', $job_id, 'ctime', SihnonFramework_Log::ORDER_DESC, 30);
-$worker_log_entries = RippingCluster_LogEntry::recentEntriesByField($log, 'worker', 'job_id', $job_id, 'ctime', SihnonFramework_Log::ORDER_DESC, 30);
 $this->smarty->assign('client_log_entries', $client_log_entries);
 $this->smarty->assign('worker_log_entries', $worker_log_entries);