Changeset 266

Timestamp:

06/26/06 13:38:27 (17 years ago)

Author:

bastiaans

Message:

jobmond/jobmond.py:

• try to guess api 'pbs' for old configs

web/addons/job_monarch/index.php:

• changed makeHeader() to check for page_call. this will prevent multiple Jobarchive link/images in the header, by multiple calls

web/addons/job_monarch/overview.php:

• added makeHeader() call and filter[id] set. when only 1 job is found, it now automaticly jumps to show_hosts and sets correct filter in header html

Location:

trunk

Files:

• jobmond/jobmond.py (modified) (3 diffs)
• web/addons/job_monarch/index.php (modified) (3 diffs)
• web/addons/job_monarch/overview.php (modified) (1 diff)

trunk/jobmond/jobmond.py

@@ -106 +106 @@
 
                 BATCH_SERVER = cfg.get( 'DEFAULT', 'TORQUE_SERVER' )
+                api_guess = 'pbs'
         
         try:
@@ -117 +118 @@
 
                 BATCH_POLL_INTERVAL = cfg.getint( 'DEFAULT', 'TORQUE_POLL_INTERVAL' )
+                api_guess = 'pbs'
+                
         GMOND_CONF = cfg.get( 'DEFAULT', 'GMOND_CONF' )
 
@@ -123 +126 @@
         BATCH_HOST_TRANSLATE = getlist( cfg.get( 'DEFAULT', 'BATCH_HOST_TRANSLATE' ) )
 
-        BATCH_API = cfg.get( 'DEFAULT', 'BATCH_API' )
-
+        try:
+
+                BATCH_API = cfg.get( 'DEFAULT', 'BATCH_API' )
+
+        except ConfigParser.NoOptionError, detail:
+
+                if BATCH_SERVER and api_guess:
+                        BATCH_API = api_guess
+                else:
+                        debug_msg( 0, "fatal error: BATCH_API not set and can't make guess" )
+                        sys.exit( 1 )
+        
         return True
 

trunk/web/addons/job_monarch/index.php

@@ -86 +86 @@
 }
 
-function makeHeader() {
+function makeHeader( $page_call ) {
 
         global $tpl, $grid, $context, $initgrid;
@@ -317 +317 @@
         }
 
-        if( $JOB_ARCHIVE ) {
+        if( $JOB_ARCHIVE && $page_call == 'index' ) {
                 $tpl->newBlock( "search" );
                 $tpl->assignGlobal( "cluster_url", rawurlencode($clustername) );
@@ -407 +407 @@
 
 $title = "Torque Report";
-makeHeader();
+makeHeader( 'index' );
 $tpl->assign("cluster_url", rawurlencode($clustername) );
 $tpl->assign("cluster", $clustername );

trunk/web/addons/job_monarch/overview.php

@@ -720 +720 @@
         $tpl->assignGlobal("report_time", makeDate( $heartbeat));
 
-        //if( intval($view_jobs) == 1 and $start_time )
-        //      if( $last_displayed_job != null )
-        //              $filter[id] = $last_displayed_job;
-
-        //makeHeader();
+        if( intval($view_jobs) == 1 and $start_time )
+                if( $last_displayed_job != null )
+                        $filter[id] = $last_displayed_job;
+
+        makeHeader( 'overview' );
         setupFilterSettings();