a8fe8b8abb36f00fab1e4b11c1c008990df4965c braney Sat Mar 5 17:23:16 2022 -0800 add chromAliasSetup to hgIntegrator` diff --git src/hg/hgIntegrator/hgIntegrator.c src/hg/hgIntegrator/hgIntegrator.c index 80293f7..61d34e3 100644 --- src/hg/hgIntegrator/hgIntegrator.c +++ src/hg/hgIntegrator/hgIntegrator.c @@ -24,30 +24,31 @@ #include "hCommon.h" #include "hdb.h" #include "hgColors.h" #include "hui.h" #include "joiner.h" #include "jsHelper.h" #include "jsonParse.h" #include "knetUdc.h" #include "textOut.h" #include "trackHub.h" #include "userRegions.h" #include "web.h" #include "annoFormatTab.h" #include "annoGratorQuery.h" #include "windowsToAscii.h" +#include "chromAlias.h" /* Global Variables */ struct cart *cart = NULL; /* CGI and other variables */ struct hash *oldVars = NULL; /* Old contents of cart before it was updated by CGI */ #define QUERY_SPEC "hgi_querySpec" #define UI_CHOICES "hgi_uiChoices" #define DO_QUERY "hgi_doQuery" #define hgiRegionType "hgi_range" #define hgiRegionTypePosition "position" #define hgiRegionTypeDefault hgiRegionTypePosition static void writeCartVar(struct cartJson *cj, char *varName) { @@ -910,30 +911,31 @@ if (userDefinedRegions) printf("# region=%s:%d-%d\n", region->chrom, region->chromStart+1, region->chromEnd); regionQuery(assembly, region, dataSources, fullTrackList, formatter); } textOutClose(&textOutPipe, &savedStdout); } void doMainPage() /* Send HTML with javascript to bootstrap the user interface. */ { char *db = NULL, *genome = NULL, *clade = NULL; getDbGenomeClade(cart, &db, &genome, &clade, oldVars); +chromAliasSetup(db); char *position = windowsToAscii(cartUsualString(cart, "position", hDefaultPos(db))); cartSetLastPosition(cart, position, oldVars); initGenbankTableNames(db); webStartWrapperDetailedNoArgs(cart, trackHubSkipHubName(db), "", "Data Integrator", TRUE, FALSE, TRUE, TRUE); // Ideally these would go in the <HEAD> puts("<link rel=\"stylesheet\" href=\"//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css\">"); puts("<link rel=\"stylesheet\" href=\"//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css\">"); puts("<div id=\"appContainer\">Loading...</div>"); // Set a global JS variable hgsid. // Plain old "var ..." doesn't work (other scripts can't see it), it has to belong to window.