99b7e610ebc351cd20322de060df967e7d021e53 braney Wed Jul 6 14:44:17 2011 -0700 change some table names to correlate with reality #4502 diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c index 925b161..df5f967 100644 --- src/hg/hgTracks/simpleTracks.c +++ src/hg/hgTracks/simpleTracks.c @@ -4292,31 +4292,30 @@ char *srcTbl = trackDbRequiredSetting(tg->tdb, "wgEncodeGencodeTranscriptSource"); struct dyString *dyQuery = dyStringCreate("select 1 from %s attrs, %s transSrc where (attrs.transcriptId = \"%s\") %s", attrsTbl, srcTbl, lf->name, where->string); dyStringFree(&where); return dyQuery; } static boolean genePredClassFilterBySet(struct track *tg, char *classTable, filterBy_t *filterBySet, struct linkedFeatures *lf) /* Check if an item passes a filterBySet filter */ { struct dyString *dyQuery = NULL; if (trackDbSetting(tg->tdb, "wgEncodeGencodeVersion") != NULL) { if (startsWith("wgEncodeGencodeBasic", tg->tdb->track) || startsWith("wgEncodeGencodeComp", tg->tdb->track) - || startsWith("wgEncodeGencodeFull", tg->tdb->track) || startsWith("wgEncodeGencode2wayConsPseudo", tg->tdb->track) || startsWith("wgEncodeGencodePseudoGene", tg->tdb->track)) dyQuery = gencodeFilterBySetQuery(tg, filterBySet, lf); } else dyQuery = genePredClassFilterBySetQuery(tg, classTable, filterBySet, lf); if (dyQuery == NULL) return TRUE; struct sqlConnection *conn = hAllocConn(database); boolean passesThroughFilter = sqlQuickNum(conn, dyQuery->string); dyStringFree(&dyQuery); hFreeConn(&conn); return passesThroughFilter; } @@ -12776,31 +12775,31 @@ registerTrackHandler("altSpliceFolds", rnaSecStrMethods); registerTrackHandler("chimpSimpleDiff", chimpSimpleDiffMethods); registerTrackHandler("tfbsCons", tfbsConsMethods); registerTrackHandler("tfbsConsSites", tfbsConsSitesMethods); registerTrackHandler("pscreen", simpleBedTriangleMethods); registerTrackHandler("dless", dlessMethods); registerTrackHandler("jaxAllele", jaxAlleleMethods); registerTrackHandler("jaxPhenotype", jaxPhenotypeMethods); registerTrackHandler("jaxAlleleLift", jaxAlleleMethods); registerTrackHandler("jaxPhenotypeLift", jaxPhenotypeMethods); /* ENCODE related */ registerTrackHandlerOnFamily("wgEncodeGencode", gencodeGeneMethods); registerTrackHandlerOnFamily("wgEncodeSangerGencode", gencodeGeneMethods); registerTrackHandler("wgEncodeGencodeV7", gencodeGeneMethods); registerTrackHandler("wgEncodeGencodeBasicV7", gencodeGeneMethods); -registerTrackHandler("wgEncodeGencodeFullV7", gencodeGeneMethods); +registerTrackHandler("wgEncodeGencodeCompV7", gencodeGeneMethods); registerTrackHandler("wgEncodeGencodePseudoGeneV7", gencodeGeneMethods); registerTrackHandler("wgEncodeGencode2wayConsPseudoV7", gencodeGeneMethods); registerTrackHandler("wgEncodeGencodePolyaV7", gencodeGeneMethods); registerTrackHandlerOnFamily("wgEncodeSangerGencodeGencodeManual20081001", gencodeGeneMethods); registerTrackHandlerOnFamily("wgEncodeSangerGencodeGencodeAuto20081001", gencodeGeneMethods); registerTrackHandlerOnFamily("encodeGencodeGene", gencodeGeneMethods); registerTrackHandlerOnFamily("encodeGencodeGeneJun05", gencodeGeneMethods); registerTrackHandlerOnFamily("encodeGencodeGeneOct05", gencodeGeneMethods); registerTrackHandlerOnFamily("encodeGencodeGeneMar07", gencodeGeneMethods); registerTrackHandler("encodeGencodeIntron", gencodeIntronMethods); registerTrackHandler("encodeGencodeIntronJun05", gencodeIntronMethods); registerTrackHandler("encodeGencodeIntronOct05", gencodeIntronMethods); registerTrackHandlerOnFamily("encodeGencodeRaceFrags", gencodeRaceFragsMethods); registerTrackHandler("affyTxnPhase2", affyTxnPhase2Methods); registerTrackHandler("gvPos", gvMethods);