src/hg/lib/metaTbl.c 1.13

1.13 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/metaTbl.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/metaTbl.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -b -B -U 4 -r1.12 -r1.13
--- src/hg/lib/metaTbl.c	13 Apr 2010 16:05:50 -0000	1.12
+++ src/hg/lib/metaTbl.c	11 May 2010 01:43:30 -0000	1.13
@@ -1770,9 +1770,9 @@
 if(setting == NULL)
     return NULL;
 struct metaObj *metaObj;
 AllocVar(metaObj);
-metaObj->obj     = cloneString(tdb->tableName);
+metaObj->obj     = cloneString(tdb->table);
 metaObj->objType = otTable;
 return metaObjAddVarPairs(metaObj,setting);
 }
 
@@ -1796,10 +1796,10 @@
     }
 
 struct sqlConnection *conn = sqlConnect(db);
 char *metaTbl = metaTblName(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(metaTbl != NULL)
     metaObj = metaObjQueryByObj(conn,metaTbl,table,NULL);
 sqlDisconnect(&conn);