250c1436761a3b38e4fcc5007b70d07d647285ce angie Mon Sep 24 12:41:47 2012 -0700 Pauline found that hgTable's 'describe table schema' page was not showingthe track description for bigDataUrl track types. Hooked those up, and restricted a whitespace tweak to only descriptions that start with <H2> so plain text descriptions don't get squashed up against the section title. diff --git src/hg/hgTables/hgTables.h src/hg/hgTables/hgTables.h index 60bd67a..5408f83 100644 --- src/hg/hgTables/hgTables.h +++ src/hg/hgTables/hgTables.h @@ -59,30 +59,32 @@ /* Close down html format page. */ void textOpen(); /* Start up page in text format. (No need to close this). */ void explainWhyNoResults(FILE *f); /* Put up a little explanation to user of why they got nothing. */ char *curTableLabel(); /* Return label for current table - track short label if it's a track, * otherwise track name. */ char *getScriptName(); /* returns script name from environment or hardcoded for command line */ +void printTrackHtml(struct trackDb *tdb); +/* If trackDb has html for table, print it out in a new section. */ /* ---------- Other UI stuff. ----------------------*/ boolean varOn(char *var); /* Return TRUE if variable exists and is set. */ void printMainHelp(); /* Put up main page help info. */ struct grp *showGroupField(char *groupVar, char *groupScript, struct sqlConnection *conn, boolean allTablesOk); /* Show group control. Returns selected group. */ struct trackDb *showTrackField(struct grp *selGroup, char *trackVar, char *trackScript); @@ -763,83 +765,83 @@ struct slName *bigBedGetFields(char *table, struct sqlConnection *conn); /* Get fields of bigBed as simple name list. */ struct sqlFieldType *bigBedListFieldsAndTypes(char *table, struct sqlConnection *conn); /* Get fields of bigBed as list of sqlFieldType. */ struct bed *bigBedGetFilteredBedsOnRegions(struct sqlConnection *conn, char *db, char *table, struct region *regionList, struct lm *lm, int *retFieldCount); /* Get list of beds from bigBed, in all regions, that pass filtering. */ void bigBedTabOut(char *db, char *table, struct sqlConnection *conn, char *fields, FILE *f); /* Print out selected fields from Big Bed. If fields is NULL, then print out all fields. */ -void showSchemaBigBed(char *table); +void showSchemaBigBed(char *table, struct trackDb *tdb); /* Show schema on bigBed. */ /* More stuff in bigBed.c that makes use of autoSql files. */ struct sqlFieldType *sqlFieldTypesFromAs(struct asObject *as); /* Convert asObject to list of sqlFieldTypes */ /* BAM stuff from bam.c */ boolean isBamTable(char *table); /* Return TRUE if table corresponds to a BAM file. */ struct slName *bamGetFields(char *table); /* Get fields of bam as simple name list. */ struct sqlFieldType *bamListFieldsAndTypes(); /* Get fields of BAM as list of sqlFieldType. */ struct hTableInfo *bamToHti(char *table); /* Get standard fields of BAM into hti structure. */ -void showSchemaBam(char *table); +void showSchemaBam(char *table, struct trackDb *tdb); /* Show schema on bam. */ void bamTabOut(char *db, char *table, struct sqlConnection *conn, char *fields, FILE *f); /* Print out selected fields from BAM. If fields is NULL, then print out all fields. */ struct bed *bamGetFilteredBedsOnRegions(struct sqlConnection *conn, char *db, char *table, struct region *regionList, struct lm *lm, int *retFieldCount); /* Get list of beds from BAM, in all regions, that pass filtering. */ struct slName *randomBamIds(char *table, struct sqlConnection *conn, int count); /* Return some semi-random qName based IDs from a BAM file. */ /* VCF (Variant Call Format) stuff from vcf.c */ extern char *vcfDataLineAutoSqlString; boolean isVcfTable(char *table); /* Return TRUE if table corresponds to a VCF file. */ struct slName *vcfGetFields(char *table); /* Get fields of VCF as simple name list. */ struct sqlFieldType *vcfListFieldsAndTypes(); /* Get fields of VCF as list of sqlFieldType. */ struct hTableInfo *vcfToHti(char *table); /* Get standard fields of VCF into hti structure. */ -void showSchemaVcf(char *table); +void showSchemaVcf(char *table, struct trackDb *tdb); /* Show schema on VCF. */ void vcfTabOut(char *db, char *table, struct sqlConnection *conn, char *fields, FILE *f); /* Print out selected fields from VCF. If fields is NULL, then print out all fields. */ struct bed *vcfGetFilteredBedsOnRegions(struct sqlConnection *conn, char *db, char *table, struct region *regionList, struct lm *lm, int *retFieldCount); /* Get list of beds from VCF, in all regions, that pass filtering. */ struct slName *randomVcfIds(char *table, struct sqlConnection *conn, int count); /* Return some semi-random IDs from a VCF file. */ /* ----------- Custom track stuff. -------------- */ struct customTrack *getCustomTracks();