00d6b45fd33ab330efcf6d6b88b0d6e9a7880281 kent Thu Oct 28 14:54:35 2010 -0700 Redoing dataHub using new trackHub library routines. Still pretty embryonic, but once again is displaying a couple of tracks for me, this time ones that are genuinely remote. Code is activated by having a 'tracksHub' variable in the cart, which currently is only possible by hacking with cartDump. diff --git src/hg/hgTracks/hgTracks.h src/hg/hgTracks/hgTracks.h index f80fe0a..814855d 100644 --- src/hg/hgTracks/hgTracks.h +++ src/hg/hgTracks/hgTracks.h @@ -1217,32 +1217,32 @@ void doSearchTracks(struct group *groupList); boolean superTrackHasVisibleMembers(struct trackDb *tdb); enum trackVisibility limitedVisFromComposite(struct track *subtrack); /* returns the subtrack visibility which may be limited by composite with multi-view dropdowns. */ char *getScoreFilterClause(struct cart *cart,struct trackDb *tdb,char *scoreColumn); // Returns "score >= ..." extra where clause if one is needed boolean advancedJavascriptFeaturesEnabled(struct cart *cart); // Returns TRUE if drag-and-zoom is currently on #define SMALLBUF 128 -char *bbiNameFromTable(struct sqlConnection *conn, char *table); -/* Return file name from little track table. */ +char *bbiNameFromSettingOrTable(struct trackDb *tdb, struct sqlConnection *conn, char *table); +/* Return file name from little table. */ char *trackUrl(char *mapName, char *chromName); /* Return hgTrackUi url; chromName is optional. */ void bedDetailCtMethods (struct track *tg, struct customTrack *ct); /* Load bedDetail track from custom tracks as bed or linked features */ void pgSnpCtMethods (struct track *tg); /* Load pgSnp track from custom tracks */ #ifdef SUBTRACKS_HAVE_VIS void parentChildCartCleanup(struct track *trackList,struct cart *newCart,struct hash *oldVars); /* When composite/view settings changes, remove subtrack specific vis When superTrackChild is found and selected, shape superTrack to match. */ #endif//def SUBTRACKS_HAVE_VIS