src/hg/hgTracks/loweLabTracks.c 1.32

1.32 2010/05/11 01:43:27 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/hgTracks/loweLabTracks.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/loweLabTracks.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -b -B -U 4 -r1.31 -r1.32
--- src/hg/hgTracks/loweLabTracks.c	21 Dec 2009 22:43:34 -0000	1.31
+++ src/hg/hgTracks/loweLabTracks.c	11 May 2010 01:43:27 -0000	1.32
@@ -89,9 +89,9 @@
 struct sqlResult *sr;
 char **row;
 int rowOffset;
 
-sr = hRangeQuery(conn, tg->mapName, chromName, winStart, winEnd, NULL, &rowOffset);
+sr = hRangeQuery(conn, tg->table, chromName, winStart, winEnd, NULL, &rowOffset);
 while ((row = sqlNextRow(sr)) != NULL)
     {
     bed = bedLoadN(row+rowOffset, 6);
     slAddHead(&list, bed);
@@ -332,11 +332,11 @@
 char *codeNames[18] = {"within genus", "\t", "crenarchaea", "euryarchaea", "\t", "bacteria", 
 		       "\t", "eukarya", "\t", "thermophile", "hyperthermophile","acidophile",
 		       "alkaliphile", "halophile", "methanogen", "strict aerobe",
 		       "strict anaerobe", "anaerobe or aerobe"}; int i;
-safef(cMode, sizeof(cMode), "%s.scoreFilter", tg->tdb->tableName);
+safef(cMode, sizeof(cMode), "%s.scoreFilter", tg->tdb->track);
 cutoff=cartUsualInt(cart, cMode,0 );
-sr=hRangeQuery(conn, tg->mapName, chromName, winStart, winEnd, NULL, 0);
+sr=hRangeQuery(conn, tg->table, chromName, winStart, winEnd, NULL, 0);
 
 while ((row = sqlNextRow(sr)) != NULL)
     {
     cb = codeBlastLoad(row);
@@ -570,9 +570,9 @@
 struct sqlResult *sr;
 char **row;
 int rowOffset;
 
-sr = hRangeQuery(conn, tg->mapName, chromName, winStart, winEnd, NULL, &rowOffset);
+sr = hRangeQuery(conn, tg->table, chromName, winStart, winEnd, NULL, &rowOffset);
 while ((row = sqlNextRow(sr)) != NULL)
     {
     bed = bedLoadN(row+rowOffset, 15);
     slAddHead(&list, bed);
@@ -652,9 +652,9 @@
 double gcSetting = (double)cartUsualInt(cart, "rnaHybridization.gc", 50) / 100;
 int hideTrnaSetting = cartUsualBoolean(cart, "rnaHybridization.hideTrna", FALSE);
 int showKnownTargetsSetting = cartUsualBoolean(cart, "rnaHybridization.showKnownTargets", TRUE);
 
-sr = hRangeQuery(conn, tg->mapName, chromName, winStart, winEnd, NULL, &rowOffset);
+sr = hRangeQuery(conn, tg->table, chromName, winStart, winEnd, NULL, &rowOffset);
 while ((row = sqlNextRow(sr)) != NULL)
     {
     rnaHyb = rnaHybridizationLoad(row);