Index: trunk/gridctl.php
===================================================================
--- trunk/gridctl.php	(revision 15)
+++ trunk/gridctl.php	(revision 17)
@@ -83,4 +83,5 @@
    $status_in = $status;
    $status_gw = $status;
+   $status_ex = $status;
 
    // If entry is for Airvata/Thrift, get the true current status
@@ -169,8 +170,11 @@
       case "FINISHED":
       case "DONE":
-//         if ( is_aira_job( $gfacID ) )
-//         {
-//            complete();
-//         }
+         if ( is_aira_job( $gfacID ) )
+         {
+            $status_ex    = getExperimentStatus( $gfacID );
+write_log( "$loghdr     status=$status status_ex=$status_ex" );
+            if ( $status_ex === 'COMPLETED' )
+               complete();
+         }
       case "PROCESSING":
       default:
@@ -679,4 +683,13 @@
    {
       $status_ex    = getExperimentStatus( $gfacID );
+
+      if ( $status_ex == 'EXECUTING' )
+      {
+         if ( $gfac_status == 'SUBMITTED' )
+            $status_ex    = 'QUEUED';
+         if ( $gfac_status == 'RUNNING' )
+            $status_ex    = 'ACTIVE';
+      }
+
       $gfac_status  = standard_status( $status_ex );
 write_log( "$loghdr get_gfac_status: status_ex=$status_ex gfac_status=$gfac_status" );