src/hg/lib/mdb.c 1.6
1.6 2010/05/11 01:43:30 kent
Refactoring to split the trackDb.tableName field into separate track and table fields. Similarly track.mapName field goes to the same track and table fields.
Index: src/hg/lib/mdb.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/mdb.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -B -U 4 -r1.5 -r1.6
--- src/hg/lib/mdb.c 27 Apr 2010 22:33:06 -0000 1.5
+++ src/hg/lib/mdb.c 11 May 2010 01:43:30 -0000 1.6
@@ -1811,9 +1811,9 @@
if(setting == NULL)
return NULL;
struct mdbObj *mdbObj;
AllocVar(mdbObj);
-mdbObj->obj = cloneString(tdb->tableName);
+mdbObj->obj = cloneString(tdb->table);
AllocVar(mdbObj->vars);
mdbObj->vars->var = cloneString(MDB_OBJ_TYPE);
mdbObj->vars->val = cloneString("table");
mdbObj->varHash = hashNew(0);
@@ -1841,10 +1841,10 @@
}
struct sqlConnection *conn = sqlConnect(db);
char *mdb = mdbTableName(conn,TRUE); // Look for sandbox name first
-if(tdb != NULL && tdb->tableName != NULL)
- table = tdb->tableName;
+if(tdb != NULL && tdb->table != NULL)
+ table = tdb->table;
if(mdb != NULL)
mdbObj = mdbObjQueryByObj(conn,mdb,table,NULL);
sqlDisconnect(&conn);