d8fee47cc2b32a995a9aac374c55b63cb18d896b braney Sat Mar 5 18:11:18 2011 -0800 fix some problems with BAM support. Actually look at id's for filtering, and disable subtrack merge. diff --git src/hg/hgTables/mainPage.c src/hg/hgTables/mainPage.c index ff37761..4be540f 100644 --- src/hg/hgTables/mainPage.c +++ src/hg/hgTables/mainPage.c @@ -762,31 +762,31 @@ { cgiMakeButton(hgtaDoFilterPage, "edit"); hPrintf(" "); cgiMakeButton(hgtaDoClearFilter, "clear"); if (isWig || isBedGr) wigShowFilter(conn); } else { cgiMakeButton(hgtaDoFilterPage, "create"); } hPrintf("\n"); } /* Composite track subtrack merge line. */ -boolean canSubtrackMerge = (curTrack && tdbIsComposite(curTrack)); +boolean canSubtrackMerge = (curTrack && tdbIsComposite(curTrack) && !isBam); if (canSubtrackMerge) { hPrintf("subtrack merge:\n"); if (anySubtrackMerge(database, curTable)) { cgiMakeButton(hgtaDoSubtrackMergePage, "edit"); hPrintf(" "); cgiMakeButton(hgtaDoClearSubtrackMerge, "clear"); } else { cgiMakeButton(hgtaDoSubtrackMergePage, "create"); } hPrintf("\n"); }