src/hg/hgTracks/searchTracks.c 1.2
1.2 2010/05/11 01:43:28 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/searchTracks.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/searchTracks.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -B -U 4 -r1.1 -r1.2
--- src/hg/hgTracks/searchTracks.c 1 Feb 2010 20:23:06 -0000 1.1
+++ src/hg/hgTracks/searchTracks.c 11 May 2010 01:43:28 -0000 1.2
@@ -79,9 +79,9 @@
if(*ptr)
*ptr = 0;
}
}
-// fprintf(stderr, "%s; setting: %s\n", track->mapName, setting);
+// fprintf(stderr, "%s; setting: %s\n", track->track, setting);
retVal = setting && strlen(setting) &&
((sameString(op, "is") && !strcasecmp(setting, val)) ||
(sameString(op, "contains") && containsStringNoCase(setting, val) != NULL));
return retVal;
@@ -200,9 +200,9 @@
(isEmpty(descSearch) || isDescriptionMatch(subTrack, descSearch, descOp)) &&
(isEmpty(metaName) || isEmpty(metaSearch) || isMetaMatch(subTrack, metaName, metaOp, metaSearch)))
{
// XXXX to parent hash. - use tdb->parent instead.
- hashAdd(parents, subTrack->mapName, track);
+ hashAdd(parents, subTrack->track, track);
// fprintf(stderr, "found subtrack: %s\n", subTrack->shortLabel);
tracksFound++;
if(tracks == NULL)
tracks = slRefNew(subTrack);
@@ -232,10 +232,10 @@
hPrintf("<td>%s</td>\n", track->shortLabel);
hPrintf("<td>%s</td>\n", track->longLabel);
// How do we get subtrack's parent?
struct track *parent = NULL;
- if(hashLookup(parents, track->mapName) != NULL)
- parent = (struct track *) hashLookup(parents, track->mapName)->val;
+ if(hashLookup(parents, track->track) != NULL)
+ parent = (struct track *) hashLookup(parents, track->track)->val;
hPrintf("<td>%s</td>\n", parent != NULL ? parent->longLabel : track->group != NULL ? track->group->label : "");
hPrintf("<td>\n");
if (tdbIsSuper(track->tdb))
{
@@ -243,9 +243,9 @@
superTrackHasVisibleMembers(track->tdb));
}
else
{
- hTvDropDownClassVisOnly(track->mapName, track->visibility,
+ hTvDropDownClassVisOnly(track->track, track->visibility,
track->canPack, (track->visibility == tvHide) ?
"hiddenText" : "normalText",
trackDbSetting(track->tdb, "onlyVisibility"));
}