8715d83d38d8bb18adfdd9ce05771b4cede85407 angie Fri Dec 5 09:52:07 2014 -0800 Moved some hgTables code that had been copied into a couple differentplaces into a new lib module, cartTrackDb. hgGenome/import.c has code that is fairly similar but that also needs to filter out custom tracks that were generated by hgGenome. diff --git src/hg/hgVai/libifyMe.h src/hg/hgVai/libifyMe.h index 417d318..6ca5f01 100644 --- src/hg/hgVai/libifyMe.h +++ src/hg/hgVai/libifyMe.h @@ -11,34 +11,30 @@ #include "annoGrator.h" boolean lookupPosition(struct cart *cart, char *cartVar); /* Look up position if it is not already seq:start-end. * Return FALSE if it has written out HTML showing multiple search results. * If webGotWarnings() is true after this returns FALSE, no match was found * and a warning box was displayed, in which case it's good to reset position * to cart's lastPosition before proceeding. */ boolean hasCustomTracks(struct cart *cart); /* Return TRUE if cart has custom tracks for the current db. */ void nbSpaces(int count); /* Print some non-breaking spaces. */ -void initGroupsTracksTables(struct cart *cart, - struct trackDb **retFullTrackList, struct grp **retFullGroupList); -/* Get lists of all tracks and of groups that actually have tracks in them. */ - struct annoAssembly *getAnnoAssembly(char *db); /* Make annoAssembly for db. */ struct annoStreamer *streamerFromTrack(struct annoAssembly *assembly, char *selTable, struct trackDb *tdb, char *chrom, int maxOutRows); /* Figure out the source and type of data and make an annoStreamer. */ struct annoGrator *gratorFromBigDataFileOrUrl(char *fileOrUrl, struct annoAssembly *assembly, int maxOutRows, enum annoGratorOverlap overlapRule); /* Determine what kind of big data file/url we have, make an annoStreamer & in annoGrator. */ struct annoGrator *gratorFromTrackDb(struct annoAssembly *assembly, char *selTable, struct trackDb *tdb, char *chrom, int maxOutRows, struct asObject *primaryAsObj, enum annoGratorOverlap overlapRule);