Changeset 538 for trunk

Timestamp:

07/11/08 11:05:46 (15 years ago)

Author:

ramonb

Message:

job_monarch/js/jobgrid.js,
job_monarch/templates/header.tpl:

• added searchField

job_monarch/jobstore.php:

• added quickSearchJobs

Location:

trunk/web2/addons/job_monarch

Files:

• jobstore.php (modified) (8 diffs)
• js/jobgrid.js (modified) (1 diff)
• templates/header.tpl (modified) (1 diff)

trunk/web2/addons/job_monarch/jobstore.php

@@ -7 +7 @@
 // Supplied by ExtJS when DataStore has remoteSort: true
 //
-$sortfield              = $_POST["sort"];
-$sortorder              = $_POST["dir"]; // ASC or DESC
+$sortfield              = isset($_POST['sort'] ) ? $_POST["sort"] : "jid";
+$sortorder              = isset($_POST['dir'] ) ? $_POST["dir"] : "ASC"; // ASC or DESC
+
+// Search query from ext.SearchField
+//
+$query                  = isset($_POST['query']) ? $_POST['query'] : null;
 
 global $c, $clustername, $cluster;
@@ -19 +23 @@
 $pend   = (int) $_POST['limit'];
 
+//echo $pend.'p ';
 // Need to fool Ganglia here: or it won't parse XML for our cluster
 //
@@ -53 +58 @@
         $task = $HTTP_POST_VARS['task'];
 }
-
-//getList();
 
 switch($task)
@@ -64 +67 @@
         echo "{failure:true}";
         break;
+}
+
+function quickSearchJobs( $jobs, $query )
+{
+        $searchresults  = array();
+
+        foreach( $jobs as $jobid => $jobattrs )
+        {
+                if( $query != null )
+                {
+                        if( strpos( $jobattrs['jid'], $query ) !== false )
+                        {
+                                $searchresults[$jobid]  = $jobattrs;
+                        }
+                        if( strpos( $jobattrs['owner'], $query ) !== false )
+                        {
+                                $searchresults[$jobid]  = $jobattrs;
+                        }
+                        if( strpos( $jobattrs['queue'], $query ) !== false )
+                        {
+                                $searchresults[$jobid]  = $jobattrs;
+                        }
+                        if( strpos( $jobattrs['name'], $query ) !== false )
+                        {
+                                $searchresults[$jobid]  = $jobattrs;
+                        }
+                }
+        }
+
+        return $searchresults;
 }
 
@@ -181 +214 @@
 {
         global $jobs, $hearbeat, $pstart, $pend;
-        global $sortfield, $sortorder;
-
-        $job_count      = count( $jobs );
+        global $sortfield, $sortorder, $query;
+
+        $job_count              = count( $jobs );
 
         if( $job_count == 0 )
         {
-                echo 'crap({"total":"0", "results":""})';
+                echo '({"total":"0", "results":""})';
                 return 0;
         }
 
-        $jobresults     = array();
-
-        $cur_job        = 0;
-
-
-        // sorteer jobs op sortorder en sortfield
-
-        //if( $pstart > 0 ) {
-        //echo $pstart;
-        //echo $pend; }
-
+        $jobresults             = array();
+
+        $cur_job                = 0;
 
         $sorted_jobs            = sortJobs( $jobs, $sortfield, $sortorder );
 
-        $result_count           = count( $sorted_jobs );
+        if( $query != null )
+        {
+                $jobs                   = quickSearchJobs( $jobs, $query );
+        }
+        $result_count           = count( $jobs );
 
         foreach( $sorted_jobs as $jobid => $jobattrs )
@@ -214 +243 @@
                 //}
 
-                if( ( $cur_job < $pstart ) || ( ($cur_job - $pstart) >= $pend ) )
-                {
-                        $cur_job = $cur_job + 1;
+                if( ! array_key_exists( $jobid, $jobs ) )
+                {
                         continue;
                 }
 
+                $jr                     = array();
                 $jr['jid']              = strval( $jobid );
                 $jr['status']           = $jobs[$jobid]['status'];
@@ -261 +290 @@
                 }
 
-                $cur_job                = $cur_job + 1;
+                if( ( $cur_job < $pstart ) || ( ($cur_job - $pstart) >= $pend ) )
+                {
+                        $cur_job        = $cur_job + 1;
+                        continue;
+                }
+                else
+                {
+                        $cur_job        = $cur_job + 1;
+                }
 
                 $jobresults[]           = $jr;
@@ -273 +310 @@
 }
 
-// Encodes a SQL array into a JSON formated string
+// Encodes a SQL array into a JSON formated string: so that Javascript may understand it
+//
 function JEncode( $arr )
 {
-        if (version_compare(PHP_VERSION,"5.2","<"))
+        if( version_compare( PHP_VERSION, "5.2", "<" ) )
         {    
-                require_once("./JSON.php"); //if php<5.2 need JSON class
-
-                $json   = new Services_JSON();//instantiate new json object
-                $data   = $json->encode($arr);  //encode the data in json format
+                require_once( "./JSON.php" );           //if php<5.2 need JSON class
+
+                $json   = new Services_JSON();          //instantiate new json object
+                $data   = $json->encode( $arr );        //encode the data in json format
         } 
         else
         {
-                $data   = json_encode($arr);  //encode the data in json format
+                $data   = json_encode( $arr );          //encode the data in json format
         }
 

trunk/web2/addons/job_monarch/js/jobgrid.js

@@ -149 +149 @@
                 store: JobsDataStore,
                 displayInfo: true
-            })
+            }),
+      tbar: [ new Ext.app.SearchField({
+                                store: JobsDataStore,
+                                params: {start: 0, limit: 30},
+                                width: 200
+                    })
+      ]
     });
 

trunk/web2/addons/job_monarch/templates/header.tpl

@@ -11 +11 @@
 <script type="text/javascript" src="./lib/extjs/ext-all.js"></script>
 <script type="text/javascript" src="./lib/extjs/ext-all-debug.js"></script>
-
+<script type="text/javascript" src="./lib/extjs/searchfield.js"></script>
 <script type="text/javascript" src="./js/jobgrid.js"></script>
 <script type="text/javascript">