src/hg/makeDb/trackDb/makeMetaDb 1.3

Index: src/hg/makeDb/trackDb/makeMetaDb
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/makeDb/trackDb/makeMetaDb,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -B -U 4 -r1.2 -r1.3
--- src/hg/makeDb/trackDb/makeMetaDb	3 Jun 2010 01:03:17 -0000	1.2
+++ src/hg/makeDb/trackDb/makeMetaDb	3 Jun 2010 23:25:29 -0000	1.3
@@ -1,6 +1,6 @@
 #!/bin/bash -e
-usage='makeMetaDb  directory metaDb db0 ...'
+usage='makeMetaDb db metaDb file [file ..]'
 
 UNAME_N=`uname -n`
 UNAME_N=${UNAME_N/.cse.ucsc.edu/}
 
@@ -8,11 +8,11 @@
     echo "wrong # args: $usage" >&2
     exit 1
 fi
 
-directory="$1"; shift
+db="$1"; shift
 metaDb="$1"; shift
-dbs="$@"
+files="$@"
 
 # check if a database exists, print note and return non-zero if it doesn't
 dbExists() {
     local db="$1"
@@ -31,38 +31,27 @@
 
 # load metaDb for a database
 loadMetaDb() {
     local db="$1"
-    local dbpath=$(ls -1 -d */$db)
-    local org=$(echo $dbpath | sed -e 's/\/.*//')
-    local metaDir=$dbpath/metaDb/$directory
-    if test \! -d $metaDir
-    then
-        return;
-    fi
+    local metaDb="$2"
     local tmpTable=$metaDb"_tmp";
     local bakTable=$metaDb"_back";
 
     local cmd="hgsql -e \"drop table if exists $tmpTable;\" $db"
     echo $cmd
     eval $cmd 
 
-    local cmd="rm -f $metaDir/allRas; touch $metaDir/allRas; cat $metaDir/*.ra >> $metaDir/allRas; mdbUpdate -recreate $db -table=$tmpTable $metaDir/allRas"
+    local cmd="rm -f allRas; touch allRas; cat $files >> allRas; mdbUpdate -recreate $db -table=$tmpTable allRas"
     echo $cmd
     eval $cmd 
 
-    local cmd="rm $metaDir/allRas"
+    local cmd="rm allRas"
     echo $cmd
     eval $cmd 
 
     local cmd="hgsqlSwapTables -okNoTable2 -dropTable3 $db $tmpTable $metaDb $bakTable"
     echo $cmd
     eval $cmd 
 }
 
-# load for all specified databases
-for db in $dbs ; do
-    if dbExists $db ; then
-        loadMetaDb $db
-    fi
-done
+loadMetaDb $db $metaDb $files