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/vcf.c src/hg/hgTables/vcf.c index 8b23909..e084e16 100644 --- src/hg/hgTables/vcf.c +++ src/hg/hgTables/vcf.c @@ -389,34 +389,33 @@ struct slName *sl; for (sl = idList, i = 0; sl != NULL; i++, sl = sl->next, i++) { if (i+1 >= count) { slNameFreeList(&(sl->next)); break; } } freez(&fileName); return idList; } #define VCF_MAX_SCHEMA_COLS 20 -void showSchemaVcf(char *table) +void showSchemaVcf(char *table, struct trackDb *tdb) /* Show schema on vcf. */ { -struct trackDb *tdb = hashFindVal(fullTableToTdbHash, table); struct sqlConnection *conn = hAllocConn(database); char *fileName = bbiNameFromSettingOrTableChrom(tdb, conn, table, hDefaultChrom(database)); struct asObject *as = vcfAsObj(); hPrintf("<B>Database:</B> %s", database); hPrintf(" <B>Primary Table:</B> %s<br>", table); hPrintf("<B>VCF File:</B> %s", fileName); hPrintf("<BR>\n"); hPrintf("<B>Format description:</B> %s<BR>", as->comment); hPrintf("See the <A HREF=\"%s\" target=_blank>Variant Call Format specification</A> for more details<BR>\n", "http://www.1000genomes.org/wiki/analysis/vcf4.0"); /* Put up table that describes fields. */ hTableStart(); hPrintf("<TR><TH>field</TH>"); @@ -460,22 +459,23 @@ hPrintf("<TH>%s</TH>", col->name); } hPrintf("</TR>\n"); } hPrintf("<TR>"); for (colIx=0; colIx < colCount; ++colIx) { if (colCount > VCFDATALINE_NUM_COLS && colIx == colCount - 1) hPrintf("<TD>...</TD>"); else writeHtmlCell(row[colIx]); } hPrintf("</TR>\n"); } hTableEnd(); +printTrackHtml(tdb); /* Clean up and go home. */ lineFileClose(&lf); freeMem(fileName); hFreeConn(&conn); }