41b17cef5bd19dd76020705e3d1037aba8aefc5f kate Thu Dec 13 13:14:02 2018 -0800 Add support for encode3/4 TFBS clusters. refs #21139 diff --git src/hg/hgc/hgc.c src/hg/hgc/hgc.c index f304287..ee67a29 100644 --- src/hg/hgc/hgc.c +++ src/hg/hgc/hgc.c @@ -4088,46 +4088,46 @@ int wordCount; int start = cartInt(cart, "o"); int end = cartInt(cart, "t"); struct sqlConnection *conn = NULL; char *imagePath = trackDbSetting(tdb, ITEM_IMAGE_PATH); char *container = trackDbSetting(tdb, "container"); if (!trackHubDatabase(database)) conn = hAllocConnTrack(database, tdb); if (itemForUrl == NULL) itemForUrl = item; dupe = cloneString(tdb->type); wordCount = chopLine(dupe, words); headerItem = cloneString(item); + /* Suppress printing item name in page header, as it is not informative for these types of * tracks... */ if (container == NULL && wordCount > 0) { type = words[0]; if (sameString(type, "maf") || sameString(type, "wigMaf") || sameString(type, "bigMaf") || sameString(type, "netAlign") || sameString(type, "encodePeak")) headerItem = NULL; else if (( sameString(type, "narrowPeak") || sameString(type, "broadPeak") || sameString(type, "gappedPeak") ) && headerItem && sameString(headerItem, ".") ) headerItem = NULL; } - /* Print header. */ genericHeader(tdb, headerItem); if (differentString(type, "bigInteract") && differentString(type, "interact")) { // skip generic URL code as these may have multiple items returned for a click itemForUrl = getIdInUrl(tdb, item); if (itemForUrl != NULL && trackDbSetting(tdb, "url")) { printCustomUrl(tdb, itemForUrl, item == itemForUrl); printIframe(tdb, itemForUrl); } } if (plus != NULL) { @@ -4240,31 +4240,31 @@ } else if (sameString(type, "chromGraph")) { doChromGraph(tdb); } else if (sameString(type, "wig")) { genericWiggleClick(conn, tdb, item, start); } else if (sameString(type, "bigWig")) { genericBigWigClick(conn, tdb, item, start); } else if (sameString(type, "factorSource")) { - doFactorSource(conn, tdb, item, start); + doFactorSource(conn, tdb, item, start, end); } else if (sameString(type, "bed5FloatScore") || sameString(type, "bed5FloatScoreWithFdr")) { doBed5FloatScore(tdb, item); } else if (sameString(type, "bed6FloatScore")) { doBed6FloatScore(tdb, item); } else if (sameString(type, "altGraphX")) { doAltGraphXDetails(tdb,item); } //add bedDetail here @@ -25404,31 +25404,30 @@ customTracksSaveCart(database, cart, theCtList); cartSetString(cart, "i", "PrintAllSequences"); hgCustom(newCts->tdb->track, NULL); } void doMiddle() /* Generate body of HTML. */ { char *track = cartString(cart, "g"); char *item = cloneString(cartOptionalString(cart, "i")); char *parentWigMaf = cartOptionalString(cart, "parentWigMaf"); struct trackDb *tdb = NULL; - if (hIsGisaidServer()) { validateGisaidUser(cart); } /* database and organism are global variables used in many places */ getDbAndGenome(cart, &database, &genome, NULL); organism = hOrganism(database); scientificName = hScientificName(database); initGenbankTableNames(database); dbIsFound = trackHubDatabase(database) || sqlDatabaseExists(database); // Try to deal with virt chrom position used by hgTracks.