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/bigBed.c src/hg/hgTables/bigBed.c index c20403a..44c9dd8 100644 --- src/hg/hgTables/bigBed.c +++ src/hg/hgTables/bigBed.c @@ -288,31 +288,31 @@ // if we're pointing to before the start of the chrom if (startAddr < 0) startAddr = 0; // ask for ten items ivList = bigBedIntervalQuery(bbi, chromList->name, startAddr, endAddr, 10, lm); currentLen *= 2; if ((startAddr == 0) && (endAddr == chromList->size)) break; } return ivList; } -void showSchemaBigBed(char *table) +void showSchemaBigBed(char *table, struct trackDb *tdb) /* Show schema on bigBed. */ { /* Figure out bigBed file name and open it. Get contents for first chromosome as an example. */ struct sqlConnection *conn = hAllocConn(database); char *fileName = bigBedFileName(table, conn); struct bbiFile *bbi = bigBedFileOpen(fileName); struct bbiChromInfo *chromList = bbiChromList(bbi); struct lm *lm = lmInit(0); struct bigBedInterval *ivList = getTenElements(bbi, chromList, lm); /* Get description of columns, making it up from BED records if need be. */ struct asObject *as = bigBedAsOrDefault(bbi); hPrintf("<B>Database:</B> %s", database); hPrintf(" <B>Primary Table:</B> %s<br>", table); @@ -373,22 +373,22 @@ hPrintf("</TR>\n"); /* Print sample lines. */ struct bigBedInterval *iv; for (iv=ivList; iv != NULL; iv = iv->next) { bigBedIntervalToRow(iv, chromList->name, startBuf, endBuf, row, bbi->fieldCount); hPrintf("<TR>"); for (colIx=0; colIx<colCount; ++colIx) { writeHtmlCell(row[colIx]); } hPrintf("</TR>\n"); } hTableEnd(); - +printTrackHtml(tdb); /* Clean up and go home. */ lmCleanup(&lm); bbiFileClose(&bbi); freeMem(fileName); hFreeConn(&conn); }