src/hg/makeDb/metaTblUpdate/metaTblPrint.c 1.6
1.6 2010/03/31 23:47:03 tdreszer
Discover metaTbl name if not provided. Prefer sandBox version.
Index: src/hg/makeDb/metaTblUpdate/metaTblPrint.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/makeDb/metaTblUpdate/metaTblPrint.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -B -U 4 -r1.5 -r1.6
--- src/hg/makeDb/metaTblUpdate/metaTblPrint.c 30 Mar 2010 23:45:15 -0000 1.5
+++ src/hg/makeDb/metaTblUpdate/metaTblPrint.c 31 Mar 2010 23:47:03 -0000 1.6
@@ -83,9 +83,9 @@
usage();
}
char *db = optionVal("db",NULL);
-char *table = optionVal("table",METATBL_DEFAULT_NAME);
+char *table = optionVal("table",NULL);
boolean raStyle = optionExists("ra");
boolean cntObjs = optionExists("countObjs");
boolean cntVars = optionExists("countVars");
boolean cntVals = optionExists("countVals");
@@ -116,8 +116,18 @@
else
usage();
struct sqlConnection *conn = sqlConnect(db);
+
+// Find the table if necessary
+if(table == NULL)
+ {
+ table = metaTblName(conn,TRUE); // Look for sandBox name first
+ if(table == NULL)
+ errAbort("TABLE NOT FOUND: '%s.%s'.\n",db,METATBL_DEFAULT_NAME);
+ verbose(1, "Using table named '%s.%s'.\n",db,table);
+ }
+
if(byVar)
{
if(!all && metaByVars == NULL) // assertable
usage();