src/utils/qa/realTime.csh 1.11

Index: src/utils/qa/realTime.csh
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/utils/qa/realTime.csh,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -B -U 1000000 -r1.10 -r1.11
--- src/utils/qa/realTime.csh	11 Apr 2009 00:37:05 -0000	1.10
+++ src/utils/qa/realTime.csh	28 Apr 2009 19:50:46 -0000	1.11
@@ -1,84 +1,79 @@
 #!/bin/tcsh
 source `which qaConfig.csh`
 
 ################################
 #  
 #  10-10-06
 #  Robert Kuhn
 #
 #  gets update times from all machines in realTime
 #
 ################################
 
 set tablelist=""
 set tables=""
 set db=""
 set ver=""
 set subver=""
 set update=""
 
 if ( $#argv != 2 ) then
   echo
   echo "  gets update times from all machines in real time for tables in list." 
   echo
   echo "    usage:  database tablelist (will accept single table)"
   echo
   exit
 else
   set db=$argv[1]
   set tablelist=$argv[2]
 endif
 # cat $tablelist
 
 if ( "$HOST" != "hgwdev" ) then
  echo "\n error: you must run this script on dev!\n"
  exit 1
 endif
 
 # check if it is a file or a tablename
 file $tablelist | egrep "ASCII text" > /dev/null
 if (! $status) then
   set tables=`cat $tablelist`
 else
   set tables=$tablelist
 endif
 
 foreach table ($tables)
   echo
   echo $table
   echo "============="
 
   foreach machine ( hgwdev hgwbeta hgw1 hgw2 hgw3 hgw4 hgw5 hgw6 hgw7 hgw8 )
     if ( "hgw1" == $machine ) then
       echo  # space out results
     endif
     # find out version of mysql running 
     # (v 5 has different signature for TABLE STATUS output)
     # (so does ver 4.1.*)
-# echo $status
- #   set ver=`getVersion.csh $machine 1` >& /dev/null
-# echo $status
- #   set subver=`getVersion.csh $machine 2`
-# echo $status
-## temporirly disable version checking.  we are stuck on ver 4.0 and this
-## is broken. (at getVersion.csh)
-#    if ( 4 == $ver && 1 == $subver || 5 == $ver ) then
-#      # newer mysql versions use different fields
-#      set update=`getTableStatus.csh $db $machine | sed '1,2d' \
-#        | grep -w ^$table | awk '{print $14, $15}'`
-#      if ( $status ) then
-#        echo "."
-#        continue
-#      endif
-#    else
+    set ver=`getVersion.csh $machine 1` >& /dev/null
+    set subver=`getVersion.csh $machine 2`
+    if ( 4 == $ver && 1 == $subver || 5 == $ver ) then
+      # newer mysql versions use different fields
+      set update=`getTableStatus.csh $db $machine | sed '1,2d' \
+        | grep -w ^$table | awk '{print $14, $15}'`
+      if ( $status ) then
+        echo "."
+        continue
+      endif
+    else
       set update=`getTableStatus.csh $db $machine | sed '1,2d' \
         | grep -w ^$table | awk '{print $13, $14}'`
       if ( $status ) then
         echo "."
         continue
       endif
-#    endif
+    endif
     echo "."$update
   end
 end
 echo