Changeset 596 for trunk/web2/addons/job_monarch
- Timestamp:
- 02/09/09 20:40:00 (15 years ago)
- Location:
- trunk/web2/addons/job_monarch
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/web2/addons/job_monarch/jobstore.php
r587 r596 100 100 } 101 101 102 function printCacheHeaders() 103 { 104 header ("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); 105 header ("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); 106 header ("Cache-Control: no-cache, must-revalidate"); 107 header ("Pragma: no-cache"); 108 } 109 102 110 function getMetrics( $host=null ) 103 111 { … … 133 141 $results['names'] = $metric_list; 134 142 $results['total'] = $metric_count; 143 144 printCacheHeaders(); 135 145 136 146 $jsonresults = JEncode( $results ); … … 421 431 function getNodes() 422 432 { 423 global $jobs, $jobids, $clustername, $metrics ;433 global $jobs, $jobids, $clustername, $metrics, $jid; 424 434 425 435 $display_nodes = array(); 426 436 427 if( !$jobids ) 428 { 437 printCacheHeaders(); 438 439 if( !$jobids && !$jid ) 440 { 441 printf("no jobid(s)\n"); 429 442 return 1; 430 443 } 431 foreach( $jobs as $jobid => $jobattrs ) 432 { 433 if( in_array( $jobid, $jobids ) ) 434 { 435 foreach( $jobattrs['nodes'] as $jobnode ) 436 { 437 if( !in_array( $jobnode, $display_nodes) ) 438 { 439 $display_nodes[$jobid] = $jobnode; 440 } 441 } 444 foreach( $jobs[$jid]['nodes'] as $jobnode ) 445 { 446 if( !in_array( $jobnode, $display_nodes) ) 447 { 448 $display_nodes[$jobid] = $jobnode; 442 449 } 443 450 } … … 445 452 $node_results = array(); 446 453 $result_count = count( $display_nodes ); 454 447 455 foreach( $display_nodes as $jobid => $host ) 448 456 { … … 474 482 $node_results[] = $nr; 475 483 } 484 485 476 486 $jsonresults = JEncode( $node_results ); 477 487 … … 486 496 487 497 $job_count = count( $jobs ); 498 499 printCacheHeaders(); 488 500 489 501 if( $job_count == 0 ) … … 578 590 $jsonresults = JEncode( $jobresults ); 579 591 592 580 593 echo '{"total":"'. $result_count .'","results":'. $jsonresults .'}'; 581 594 -
trunk/web2/addons/job_monarch/templates/header.tpl
r593 r596 9 9 <script type="text/javascript" src="./lib/extjs/adapter/ext/ext-base.js"></script> 10 10 <!-- <script type="text/javascript" src="./lib/extjs/adapter/ext/ext-base-debug.js"></script> --> 11 <script type="text/javascript" src="./lib/extjs/adapter/ext/ext-base-debug.js"></script> 11 12 <script type="text/javascript" src="./lib/extjs/ext-all.js"></script> 12 13 <!-- <script type="text/javascript" src="./lib/extjs/ext-all-debug.js"></script> --> 14 <script type="text/javascript" src="./lib/extjs/ext-all-debug.js"></script> 13 15 <script type="text/javascript" src="./lib/extjs/searchfield.js"></script> 14 16 <script type="text/javascript" src="./js/monarch.js"></script>
Note: See TracChangeset
for help on using the changeset viewer.