src/hg/lib/hVarSubst.c 1.8
1.8 2010/05/11 01:43:29 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/hVarSubst.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/hVarSubst.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -B -U 4 -r1.7 -r1.8
--- src/hg/lib/hVarSubst.c 4 Jan 2010 19:12:29 -0000 1.7
+++ src/hg/lib/hVarSubst.c 11 May 2010 01:43:29 -0000 1.8
@@ -48,9 +48,9 @@
{
char *val = trackDbSettingClosestToHome(tdb, settingName);
if (val == NULL)
errAbort("trackDb (%s) setting \"%s\" not found for variable substitution of \"$%s\" in %s",
- tdb->tableName, settingName, varName, desc);
+ tdb->track, settingName, varName, desc);
return val;
}
static char *lookupOtherDb(char *desc, struct trackDb *tdb, char *varName)
@@ -106,9 +106,9 @@
", \t", headerWords, ArraySize(headerWords));
errno = 0;
size = sqrt(sqlDouble(words[0]));
if (errno)
- errAbort("Invalid matrix size in for track %s: %s\n", tdb->tableName,
+ errAbort("Invalid matrix size in for track %s: %s\n", tdb->track,
words[0]);
dyStringAppend(dest, "The following matrix was used:<P>\n");
k = 1;
dyStringAppend(dest, "<BLOCKQUOTE><TABLE BORDER=1 CELLPADDING=4 BORDERCOLOR=\"#aaaaaa\">\n");
@@ -304,8 +304,8 @@
void hVarSubstTrackDb(struct trackDb *tdb, char *database)
/* Substitute variables in trackDb shortLabel, longLabel, and html fields. */
{
-hVarSubstInVar(tdb->tableName, tdb, database, &tdb->shortLabel);
-hVarSubstInVar(tdb->tableName, tdb, database, &tdb->longLabel);
-hVarSubstInVar(tdb->tableName, tdb, database, &tdb->html);
+hVarSubstInVar(tdb->track, tdb, database, &tdb->shortLabel);
+hVarSubstInVar(tdb->track, tdb, database, &tdb->longLabel);
+hVarSubstInVar(tdb->track, tdb, database, &tdb->html);
}