0f3ca3eaf5792df01b7c600a5428d2d0b2809fcd max Fri Sep 20 13:18:01 2024 -0700 Revert "more features to hubtools: search in both parent and subdirs, better docs" This reverts commit 05e67c59a20a5d00b810a981aef3b00c5bef82e1. diff --git src/hg/hgc/hgc.c src/hg/hgc/hgc.c index b6eac01..71c1f64 100644 --- src/hg/hgc/hgc.c +++ src/hg/hgc/hgc.c @@ -5166,41 +5166,35 @@ boolean forestHasUnderstandableTrack(char *db, struct trackDb *tdb) // TRUE if any leaf is usable in getting DNA. { return (rFindUnderstandableTrack(db, tdb) != NULL); } struct trackDb* loadTracks() /* load native tracks, cts, userPsl and track Hubs and return tdbList */ { struct trackDb *tdbList = hTrackDb(database); struct trackDb *ctdbList = tdbForCustomTracks(); struct trackDb *utdbList = tdbForUserPsl(); struct grp *pGrpList = NULL; +struct trackDb *hubList = hubCollectTracks(database, &pGrpList); ctdbList = slCat(ctdbList, tdbList); - -//if (! trackHubDatabase(database)) - //{ - struct trackDb *hubList = hubCollectTracks(database, &pGrpList); ctdbList = slCat(ctdbList, hubList); - //} - tdbList = slCat(utdbList, ctdbList); - return tdbList; } void doGetDnaExtended1() /* Do extended case/color get DNA options. */ { boolean revComp = cartUsualBoolean(cart, "hgSeq.revComp", FALSE); boolean maskRep = cartUsualBoolean(cart, "hgSeq.maskRepeats", FALSE); int padding5 = cartUsualInt(cart, "hgSeq.padding5", 0); int padding3 = cartUsualInt(cart, "hgSeq.padding3", 0); int lineWidth = cartUsualInt(cart, "lineWidth", 60); char *casing = cartUsualString(cart, "hgSeq.casing", ""); char *repMasking = cartUsualString(cart, "hgSeq.repMasking", ""); boolean caseUpper= FALSE;