7bc24686024ec14d351ab208b5179ab251d7c463 tdreszer Fri Oct 14 16:34:15 2011 -0700 Major work on bedFilt, psl and wigMaf to make them properly composite ready. diff --git src/hg/inc/hgMaf.h src/hg/inc/hgMaf.h index d52041f..724a3b8 100644 --- src/hg/inc/hgMaf.h +++ src/hg/inc/hgMaf.h @@ -65,34 +65,34 @@ int mafCmp(const void *va, const void *vb); /* Compare to sort based on start of first component. */ struct consWiggle { struct consWiggle *next; /* Next in list */ char *table; /* phastCons table */ char *leftLabel; /* Left label for hgTracks */ char *uiLabel; /* Label to print on trackUi */ }; struct consWiggle *wigMafWiggles(char *db, struct trackDb *tdb); /* get conservation wiggle table names and labels from trackDb setting, ignoring those where table doesn't exist */ -char *wigMafWiggleVar(struct trackDb *tdb, struct consWiggle *wig); +char *wigMafWiggleVar(char *prefix, struct consWiggle *wig); /* Return name of cart variable for this cons wiggle */ struct wigMafSpecies { struct wigMafSpecies *next; char *name; int group; boolean on; }; struct wigMafSpecies * wigMafSpeciesTable(struct cart *cart, struct trackDb *tdb, char *name, char *db) ; -char **wigMafGetSpecies(struct cart *cart, struct trackDb *tdb, char *db, struct wigMafSpecies **list, int *groupCt); +char **wigMafGetSpecies(struct cart *cart, struct trackDb *tdb, char *prefix, char *db, struct wigMafSpecies **list, int *groupCt); struct consWiggle *consWiggleFind(char *db,struct trackDb *parent,char *table); /* Return conservation wig if it is found in the parent. */ #endif//ndef HGMAF_H