src/hg/hgc/mafClick.c 1.61
1.61 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/hgc/mafClick.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgc/mafClick.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -b -B -U 4 -r1.60 -r1.61
--- src/hg/hgc/mafClick.c 6 Jan 2009 00:22:10 -0000 1.60
+++ src/hg/hgc/mafClick.c 11 May 2010 01:43:29 -0000 1.61
@@ -448,16 +448,16 @@
{
if (axtOtherDb != NULL)
{
struct hash *qSizeHash = hChromSizeHash(axtOtherDb);
- struct mafAli *mafList = axtLoadAsMafInRegion(conn, tdb->tableName,
+ struct mafAli *mafList = axtLoadAsMafInRegion(conn, tdb->table,
chrom, start, end,
database, axtOtherDb, hChromSize(database, chrom), qSizeHash);
hashFree(&qSizeHash);
return mafList;
}
else
- return mafLoadInRegion2(conn, conn2, tdb->tableName, chrom,
+ return mafLoadInRegion2(conn, conn2, tdb->table, chrom,
start, end, file);
}
/* Load mafs from region, either from maf or axt file. */
@@ -468,16 +468,16 @@
{
if (axtOtherDb != NULL)
{
struct hash *qSizeHash = hChromSizeHash(axtOtherDb);
- struct mafAli *mafList = axtLoadAsMafInRegion(conn, tdb->tableName,
+ struct mafAli *mafList = axtLoadAsMafInRegion(conn, tdb->table,
chrom, start, end,
database, axtOtherDb, hChromSize(database, chrom), qSizeHash);
hashFree(&qSizeHash);
return mafList;
}
else
- return mafLoadInRegion(conn, tdb->tableName, chrom, start, end);
+ return mafLoadInRegion(conn, tdb->table, chrom, start, end);
}
#ifdef ADDEXONCAPITAL
static char *codeAll[] = {
@@ -498,9 +498,9 @@
char *chrom = cartCgiUsualString(cart, "c", "chr7");
printf("<A HREF=\"%s&g=%s&i=%s&c=%s&l=%d&r=%d&o=%d&db=%s"
"&parentWigMaf=%s\" TARGET=\"_blank\">%s</A>",
hgcPathAndSettings(), table, table, chrom,
-winStart, winEnd, winStart, database, tdb->tableName, label);
+winStart, winEnd, winStart, database, tdb->track, label);
}
static void mafOrAxtClick2(struct sqlConnection *conn, struct sqlConnection *conn2, struct trackDb *tdb, char *axtOtherDb, char *fileName)
/* Display details for MAF or AXT tracks. */
@@ -524,14 +524,14 @@
char buffer[1024];
int useTarg = FALSE;
int useIrowChains = FALSE;
- safef(option, sizeof(option), "%s.%s", tdb->tableName, MAF_CHAIN_VAR);
+ safef(option, sizeof(option), "%s.%s", tdb->track, MAF_CHAIN_VAR);
if (cartCgiUsualBoolean(cart, option, FALSE) &&
trackDbSetting(tdb, "irows") != NULL)
useIrowChains = TRUE;
- safef(buffer, sizeof(buffer), "%s.vis",tdb->tableName);
+ safef(buffer, sizeof(buffer), "%s.vis",tdb->track);
if (useIrowChains)
{
if (!cartVarExists(cart, buffer) && (speciesTarget != NULL))
useTarg = TRUE;
@@ -547,9 +547,9 @@
mafList = mafOrAxtLoadInRegion2(conn,conn2, tdb, seqName, winStart, winEnd,
axtOtherDb, fileName);
safef(dbChrom, sizeof(dbChrom), "%s.%s", database, seqName);
- safef(option, sizeof(option), "%s.speciesOrder", tdb->tableName);
+ safef(option, sizeof(option), "%s.speciesOrder", tdb->track);
speciesOrder = cartUsualString(cart, option, NULL);
if (speciesOrder == NULL)
speciesOrder = trackDbSetting(tdb, "speciesOrder");
@@ -575,9 +575,9 @@
organism = hOrganism(buf);
if (!organism)
organism = buf;
nextMc = mc->next;
- safef(option, sizeof(option), "%s.%s", tdb->tableName, buf);
+ safef(option, sizeof(option), "%s.%s", tdb->track, buf);
if (!cartUsualBoolean(cart, option, TRUE))
{
if (speciesOffHash == NULL)
speciesOffHash = newHash(4);
@@ -704,9 +704,9 @@
}
puts("</P>\n");
/* no alignment to display when in visibilities where only wiggle is shown */
- char *vis = cartOptionalString(cart, tdb->tableName);
+ char *vis = cartOptionalString(cart, tdb->track);
if (vis)
{
enum trackVisibility tv = hTvFromStringNoAbort(vis);
if (tv == tvSquish || tv == tvDense)
@@ -1081,14 +1081,14 @@
int itemPrinted;
int mafOrig;
char query[256];
- safef(option, sizeof(option), "%s.%s", tdb->tableName, MAF_CHAIN_VAR);
+ safef(option, sizeof(option), "%s.%s", tdb->track, MAF_CHAIN_VAR);
if (cartCgiUsualBoolean(cart, option, FALSE) &&
trackDbSetting(tdb, "irows") != NULL)
useIrowChains = TRUE;
- safef(buffer, sizeof(buffer), "%s.vis",tdb->tableName);
+ safef(buffer, sizeof(buffer), "%s.vis",tdb->track);
if (useIrowChains)
{
if (!cartVarExists(cart, buffer) && (speciesTarget != NULL))
useTarg = TRUE;
@@ -1104,14 +1104,14 @@
mafList = mafOrAxtLoadInRegion(conn, tdb, seqName, winStart, winEnd,
axtOtherDb);
safef(dbChrom, sizeof(dbChrom), "%s.%s", database, seqName);
- safef(option, sizeof(option), "%s.speciesOrder", tdb->tableName);
+ safef(option, sizeof(option), "%s.speciesOrder", tdb->track);
speciesOrder = cartUsualString(cart, option, NULL);
if (speciesOrder == NULL)
speciesOrder = trackDbSetting(tdb, "speciesOrder");
- safef(query, sizeof(query), "select chromStart from %s", tdb->tableName);
+ safef(query, sizeof(query), "select chromStart from %s", tdb->table);
mafOrig = atoi(sqlNeedQuickString(conn, query));
for (maf = mafList; maf != NULL; maf = maf->next)
{
@@ -1135,9 +1135,9 @@
organism = hOrganism(buf);
if (!organism)
organism = buf;
nextMc = mc->next;
- safef(option, sizeof(option), "%s.%s", tdb->tableName, buf);
+ safef(option, sizeof(option), "%s.%s", tdb->track, buf);
if (!cartUsualBoolean(cart, option, TRUE))
{
if (speciesOffHash == NULL)
speciesOffHash = newHash(4);