4d1bafe4de39413f4ab1a9cd7183c64655b01e0a kate Mon Oct 24 14:59:31 2016 -0700 Temporarily hardcode hg19 for review purposes. refs #17369 diff --git src/hg/hgGtexTrackSettings/hgGtexTrackSettings.c src/hg/hgGtexTrackSettings/hgGtexTrackSettings.c index 6a96147..bc47caa 100644 --- src/hg/hgGtexTrackSettings/hgGtexTrackSettings.c +++ src/hg/hgGtexTrackSettings/hgGtexTrackSettings.c @@ -54,37 +54,42 @@ jsIncludeFile("utils.js",NULL); } static void printTrackDescription() { puts("<a name='TRACK_HTML'></a>"); puts("<div class='row gbSectionBanner gbSimpleBanner'>"); puts("<div class='col-md-11'>Track Description</div>"); puts("<div class='col-md-1'>" "<a href='#TRACK_TOP' title='Jump to top of page'>" "<i class='gbBannerIcon gbGoIcon fa fa-lg fa-arrow-circle-up'></i>" //"<i class='gbBannerIcon gbGoIcon fa fa-lg fa-level-up'></i>" "</a></div>"); puts("</div>"); struct sqlConnection *conn = sqlConnect(db); +if (conn == NULL) + errAbort("Can't connect to database %s\n", db); char query[256]; sqlSafef(query, sizeof(query), "select html from trackDb where tableName='gtexGene'"); char *html = sqlQuickString(conn, query); -sqlDisconnect(&conn); +if (html != NULL) + { puts("<div class='trackDescriptionPanel'>"); puts("<div class='trackDescription'>"); puts(html); + } +sqlDisconnect(&conn); puts("</div></div>"); puts("</div>"); } static void printTissueTable(char *version) /* Output HTML with tissue labels and colors, in 2 columns, to fit next to body map */ { struct gtexTissue *tis, *tissues = gtexGetTissues(version); struct gtexTissue **tisTable = NULL; int count = slCount(tissues); AllocArray(tisTable, count); int i=0, col=0; int cols = 2; int last = count/2 + 1; @@ -108,31 +113,37 @@ if (col > cols-1) { puts("</tr>\n<tr>"); col = 0; } } puts("</tr>\n"); puts("</table>"); } static void doMainPage() /* Send HTML with javascript to bootstrap the user interface. */ { // Start web page with new banner char *genome = NULL, *clade = NULL; -getDbGenomeClade(cart, &db, &genome, &clade, oldVars); +//getDbGenomeClade(cart, &db, &genome, &clade, oldVars); + +/* hardcode for now -- later, check for hg19 or hg38 */ + +db = "hg19"; +genome = "human"; +clade = "mammal"; // char *chromosome = cartUsualString(cart, "c", hDefaultChrom(database)); //char *track = cartString(cart, "g"); webStartJWestNoBanner(cart, db, "Genome Browser GTEx Track Settings"); puts("<link rel=\"stylesheet\" href=\"../style/bootstrap.min.css\">"); puts("<link rel=\"stylesheet\" href=\"../style/hgGtexTrackSettings.css\">"); // The initial visible page elements are hgGtexTrackSettings.html, // which is transformed into a quoted .h // file containing a string constant that we #include and print here (see makefile). puts( #include "hgGtexTrackSettings.html.h" ); @@ -144,31 +155,31 @@ printTissueTable(gtexVersion(table)); puts("</div></div></div></div>"); printTrackDescription(); puts("</div>"); // end panel, section and body layout container // Track description // JS libraries doJsIncludes(); // Main JS -puts("<script src=\"../js/hgGtexTrackSettings.js\"></script>"); +puts("<script src='../js/hgGtexTrackSettings.js'></script>"); webIncludeFile("inc/jWestFooter.html"); webEndJWest(); } void doMiddle(struct cart *theCart) /* Display the main page or execute a command and update the page */ { cart = theCart; if (cgiOptionalString(CARTJSON_COMMAND)) doCartJson(); else doMainPage();