src/hg/makeDb/metaTblUpdate/metaTblPrint.c 1.3
1.3 2010/03/19 21:25:26 tdreszer
Altered API to put sql connection inside lib API
Index: src/hg/makeDb/metaTblUpdate/metaTblPrint.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/makeDb/metaTblUpdate/metaTblPrint.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -B -U 4 -r1.2 -r1.3
--- src/hg/makeDb/metaTblUpdate/metaTblPrint.c 19 Mar 2010 17:38:09 -0000 1.2
+++ src/hg/makeDb/metaTblUpdate/metaTblPrint.c 19 Mar 2010 21:25:26 -0000 1.3
@@ -123,16 +123,15 @@
}
else
usage();
-struct sqlConnection *conn = sqlConnect(db);
if(byVar)
{
if(metaByVars == NULL) // assertable
usage();
// Requested a single var
- struct metaByVar * queryResults = metaByVarsQuery(conn,table,metaByVars);
+ struct metaByVar * queryResults = metaByVarsQuery(db,table,metaByVars);
if(queryResults == NULL)
verbose(1, "No metadata met your selection criteria\n");
else
{
@@ -149,14 +148,14 @@
struct metaObj * queryResults = NULL;
if(metaByVars != NULL)
{
// Requested a set of var=val pairs and looking for the unique list of objects that have all of them!
- queryResults = metaObjsQueryByVars(conn,table,metaByVars);
+ queryResults = metaObjsQueryByVars(db,table,metaByVars);
}
else
{
// Requested a single obj
- queryResults = metaObjQuery(conn,table,metaObjs);
+ queryResults = metaObjQuery(db,table,metaObjs);
}
if(queryResults == NULL)
verbose(1, "No metadata met your selection criteria\n");
@@ -169,9 +168,8 @@
metaObjPrint(queryResults,printLong);
metaObjsFree(&queryResults);
}
}
-sqlDisconnect(&conn);
if(cntObjs || cntVars || cntVals)
{
if(cntObjs)