8b77522373a903e6b69e1f648dfcadc6cc92bf0b braney Fri Jun 7 17:29:08 2013 -0700 notify folks that genome graphs doesn't work with assembly hubs diff --git src/hg/hgGenome/hgGenome.c src/hg/hgGenome/hgGenome.c index 6e70731..1d112ea 100644 --- src/hg/hgGenome/hgGenome.c +++ src/hg/hgGenome/hgGenome.c @@ -18,30 +18,31 @@ #include "portable.h" #include "hgColors.h" #include "trackLayout.h" #include "chromInfo.h" #include "vGfx.h" #include "genoLay.h" #include "cytoBand.h" #include "hCytoBand.h" #include "errCatch.h" #include "chromGraph.h" #include "customTrack.h" #include "hCommon.h" #include "hPrint.h" #include "jsHelper.h" #include "hgGenome.h" +#include "trackHub.h" /* ---- Global variables. ---- */ struct cart *cart; /* This holds cgi and other variables between clicks. */ struct hash *oldVars; /* Old cart hash. */ char *database; /* Name of genome database - hg15, mm3, or the like. */ char *genome; /* Name of genome - mouse, human, etc. */ struct trackLayout tl; /* Dimensions of things, fonts, etc. */ struct genoGraph *ggUserList; /* List of user graphs */ struct genoGraph *ggDbList; /* List of graphs in database. */ struct genoGraph *ggCompList; /* List of composite genome graphs (DB only). */ struct slRef *ggList; /* List of active genome graphs */ struct hash *ggHash; /* Hash of active genome graphs */ boolean withLabels; /* Draw labels? */ @@ -530,30 +531,32 @@ cartWarnCatcher(dispatchPage, cart, cartEarlyWarningHandler); cartCheckout(&cart); } void dispatchLocation() /* When this is called no output has been written at all. We * look at command variables in cart and figure out if we just * are going write an HTTP location line, which happens when we * want to invoke say the genome browser or gene sorter without * another intermediate page. If we need to do more than that * then we call hggDoUsualHttp. */ { struct sqlConnection *conn = NULL; getDbAndGenome(cart, &database, &genome, oldVars); +if (trackHubDatabase(database)) + errAbort("Assembly Data Hubs not supported in Genome Graphs"); cartSetString(cart, "db", database); /* Some custom tracks code needs this */ withLabels = cartUsualBoolean(cart, hggLabels, TRUE); conn = hAllocConn(database); getGenoGraphs(conn); /* Handle cases that just want a HTTP Location line: */ if (cartVarExists(cart, hggClickX)) { clickOnImage(conn); return; } hFreeConn(&conn); /* For other cases we want to print out some of the usual HTTP