Index: trunk/web2/addons/job_monarch/jobstore.php
===================================================================
--- trunk/web2/addons/job_monarch/jobstore.php (revision 595)
+++ trunk/web2/addons/job_monarch/jobstore.php (revision 596)
@@ -100,4 +100,12 @@
}
+function printCacheHeaders()
+{
+ header ("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+ header ("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+ header ("Cache-Control: no-cache, must-revalidate");
+ header ("Pragma: no-cache");
+}
+
function getMetrics( $host=null )
{
@@ -133,4 +141,6 @@
$results['names'] = $metric_list;
$results['total'] = $metric_count;
+
+ printCacheHeaders();
$jsonresults = JEncode( $results );
@@ -421,23 +431,20 @@
function getNodes()
{
- global $jobs, $jobids, $clustername, $metrics;
+ global $jobs, $jobids, $clustername, $metrics, $jid;
$display_nodes = array();
- if( !$jobids )
- {
+ printCacheHeaders();
+
+ if( !$jobids && !$jid )
+ {
+ printf("no jobid(s)\n");
return 1;
}
- foreach( $jobs as $jobid => $jobattrs )
- {
- if( in_array( $jobid, $jobids ) )
- {
- foreach( $jobattrs['nodes'] as $jobnode )
- {
- if( !in_array( $jobnode, $display_nodes) )
- {
- $display_nodes[$jobid] = $jobnode;
- }
- }
+ foreach( $jobs[$jid]['nodes'] as $jobnode )
+ {
+ if( !in_array( $jobnode, $display_nodes) )
+ {
+ $display_nodes[$jobid] = $jobnode;
}
}
@@ -445,4 +452,5 @@
$node_results = array();
$result_count = count( $display_nodes );
+
foreach( $display_nodes as $jobid => $host )
{
@@ -474,4 +482,6 @@
$node_results[] = $nr;
}
+
+
$jsonresults = JEncode( $node_results );
@@ -486,4 +496,6 @@
$job_count = count( $jobs );
+
+ printCacheHeaders();
if( $job_count == 0 )
@@ -578,4 +590,5 @@
$jsonresults = JEncode( $jobresults );
+
echo '{"total":"'. $result_count .'","results":'. $jsonresults .'}';
Index: trunk/web2/addons/job_monarch/templates/header.tpl
===================================================================
--- trunk/web2/addons/job_monarch/templates/header.tpl (revision 595)
+++ trunk/web2/addons/job_monarch/templates/header.tpl (revision 596)
@@ -9,6 +9,8 @@
+
+