src/hg/lib/hdb.c 1.395
1.395 2009/02/18 22:11:45 markd
added dbProfile as the prefered name for a trackDb database profile setting
Index: src/hg/lib/hdb.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/hdb.c,v
retrieving revision 1.394
retrieving revision 1.395
diff -b -B -U 4 -r1.394 -r1.395
--- src/hg/lib/hdb.c 5 Feb 2009 00:19:13 -0000 1.394
+++ src/hg/lib/hdb.c 18 Feb 2009 22:11:45 -0000 1.395
@@ -465,18 +465,19 @@
char *getTrackProfileName(struct trackDb *tdb)
/* get profile is associated with a track, return it, otherwise NULL */
{
-// FIXME: logicalDb will not work in the long term, remove when this
-// functionality is dropped
-return trackDbSetting(tdb, "logicalDb");
+// FIXME: locicalDb is an old name used by the cancer browser
+char *p = trackDbSetting(tdb, "dbProfile");
+if (p == NULL)
+ p = trackDbSetting(tdb, "logicalDb");
+return p;
}
struct sqlConnection *hAllocConnTrack(char *db, struct trackDb *tdb)
/* Get free connection for accessing tables associated with the specified
* track and database. If none is available, allocate a new one. */
{
-// FIXME: this will go away
return hAllocConnProfile(getTrackProfileName(tdb), db);
}
struct sqlConnection *hAllocConnProfileTbl(char *db, char *spec, char **tableRet)