src/utils/qa/qaThis.csh 1.12

Index: src/utils/qa/qaThis.csh
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/utils/qa/qaThis.csh,v
retrieving revision 1.11
retrieving revision 1.12
diff -b -B -U 4 -r1.11 -r1.12
--- src/utils/qa/qaThis.csh	15 Apr 2010 17:22:34 -0000	1.11
+++ src/utils/qa/qaThis.csh	27 Apr 2010 20:40:26 -0000	1.12
@@ -7,22 +7,13 @@
 
 set db=''
 set tableList=''
 set table =''
-set first=""
-set second=""
-#set third=""
-set fourth=""
+set devTime=""
+set betaTime=""
+set rrTime=""
 set countPerChr=""
 
-#if ($#argv == 1) then
-#  if ( $argv[1] == "CLEAN" || $argv[1] == "clean" ) then 
-#  rm *.qa
-#  rm *.gapFile
-#  exit 0
-#  endif
-#endif
-
 if ($#argv < 2 || $#argv > 3) then
   echo
   echo " Runs basic QA scripts on your table(s)"
   echo
@@ -33,12 +24,10 @@
   echo "    If redirecting output, be sure"
   echo "    to redirect stdout and stderr (>&) "
   echo
   echo "    Works if you provide a list of tables"
-  echo "    In that case, it creates db.tableName.qa files"
+  echo "    In that case, it creates tableList.db.qa"
   echo 
-#  echo "    Added clean-up functionality to remove all .qa and .gapFile files"
-#  echo "    Usage:   CLEAN or clean"
   echo
 
   exit
 else
@@ -59,18 +48,24 @@
 if (! $status) then
  set tables=`cat $tableList`
  if ( $countPerChr != "c" ) then
    foreach table ( $tables )
-     $0 $db $table >& $db.$table.qa
+     $0 $db $table >>& $db.$tableList.qa
    end
  else  
    foreach table ( $tables )
-     $0 $db $table c >& $db.$table.qa
+     $0 $db $table c >>& $db.$tableList.qa
    end
  endif  
 else
   set tables=$tableList
 
+#--------------------------------------------------
+#Display Table name  
+echo "~!~!~!~!~!~!~!~!~!~!~!~!~!~!~!~ "
+echo "$tables"
+echo
+
 #------------------------------------------------
 #check getSplit.csh 
 echo "*~*~*~*~*~*~*~*~*~*~*~*~*~*"
 echo "Is this table split (using getSplit.csh)"
@@ -81,20 +76,20 @@
 # check updateTimes for each table:
 
 echo "*~*~*~*~*~*~*~*~*~*~*~*~*~*"
 echo
-set first=`hgsql -N -e 'SHOW TABLE STATUS LIKE "'$tables'"' $db \
+set devTime=`hgsql -N -e 'SHOW TABLE STATUS LIKE "'$tables'"' $db \
    | awk '{print $14, $15}'`
-set second=`hgsql -h $sqlbeta -N -e 'SHOW TABLE STATUS LIKE "'$tables'"' $db \
+set betaTime=`hgsql -h $sqlbeta -N -e 'SHOW TABLE STATUS LIKE "'$tables'"' $db \
    | awk '{print $14, $15}'`
-set fourth=`getRRtableStatus.csh $db $tables Update_time`
+set rrTime=`getRRtableStatus.csh $db $tables Update_time`
 if ( $status ) then
-    set fourth=""
+    set rrTime=""
 endif    
 echo "Check updateTimes for each table:"
-echo "Dev:  $first "
-echo "Beta: $second"
-echo "RR:   $fourth" 
+echo "Dev:  $devTime "
+echo "Beta: $betaTime"
+echo "RR:   $rrTime" 
 
 
 # ------------------------------------------------
 # check FeatureBits for table:
@@ -109,17 +104,10 @@
   echo
 endif
 
 echo "featureBits -countGaps $db $tables gap"
-featureBits -countGaps $db $tables gap -bed=$db.$tables.gapFile
-echo
-if ( -z $db.$tables.gapFile ) then
-echo
-rm -f $db.$tables.gapFile
-else
-echo "There are gaps overlapping $tables (gaps may be bridged or not):"
-echo "Gap file is here: $db.gapFile" 
-endif
+featureBits -countGaps $db $tables gap 
+
 		    
 # ------------------------------------------------
 # check Table sort for table:
 
@@ -159,12 +147,12 @@
 echo "Verify the makedoc at:"
 echo "~/kent/src/hg/makeDb/doc/$db.txt"
 
 #----------------------------------------------
-#Show the first 2 rows
+#Show the first 3 rows
 echo "*~*~*~*~*~*~*~*~*~*~*~*~*~*"
-echo "Here are the first two rows of the table:"
-hgsql -e "select * from ${tables} limit 2" $db
+echo "Here are the first three rows of the table:"
+hgsql -e "select * from ${tables} limit 3" $db
 
 #------------------------------------------------
 #Count per Chrom 
   if ( $countPerChr == "c" ) then