00ec008b30fc1fac794778fc5ae75b4fa3362a68 tdreszer Fri Oct 1 13:52:37 2010 -0700 SuperTracks can now be found in simple search too. diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index 1845f9f..d9f435c 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -3904,8 +3904,6 @@ if (hTvFromString(cartUsualString(cart, track->track, hStringFromTv(track->tdb->visibility))) != tvHide) setSuperTrackHasVisibleMembers(track->tdb->parent); -//#define SUPER_PARENTS // Turns out this wasn't necessary to solve my problem, but it is the right thing to do, so saving it for later -#ifdef SUPER_PARENTS assert(track->parent == NULL); track->parent = hashFindVal(superHash, track->tdb->parentName); if (track->parent) @@ -3913,13 +3911,8 @@ /* create track and reference for the supertrack */ struct track *superTrack = track->parent = trackFromTrackDb(track->tdb->parent); track->parent = superTrack; -#else///ifndef SUPER_PARENTS - if (hashLookup(superHash, track->tdb->parentName)) - /* ignore supertrack if it's already been handled */ - continue; - /* create track and reference for the supertrack */ - struct track *superTrack = trackFromTrackDb(track->tdb->parent); -#endif///ndef SUPER_PARENTS + if (trackHash != NULL) + hashAddUnique(trackHash,superTrack->track,superTrack); superTrack->hasUi = TRUE; superTrack->group = group; superTrack->groupName = cloneString(group->name);