222992ee5c992c1ba25babcb8736eadb5ad0366c
braney
Thu Nov 20 18:07:58 2014 -0800
when hubs disappear out from under us, put out a kindler, gentler errormessage that gives people a clue what's happened. #14365
diff --git src/hg/hgGateway/hgGateway.c src/hg/hgGateway/hgGateway.c
index 09aae47..9a548fa 100644
--- src/hg/hgGateway/hgGateway.c
+++ src/hg/hgGateway/hgGateway.c
@@ -267,30 +267,32 @@
char buffer[128];
/* tell html routines *not* to escape htmlOut strings*/
htmlNoEscape();
buffer[0] = 0;
if ((scientificName != NULL) && (*scientificName != 0))
{
if (sameString(clade,"ancestor"))
safef(buffer, sizeof(buffer), "(%s Ancestor) ", scientificName);
else
safef(buffer, sizeof(buffer), "(%s) ", scientificName);
}
cartWebStart(theCart, db, "%s %s%s Gateway\n", trackHubSkipHubName(organism), buffer, hBrowserName());
htmlDoEscape();
}
+
+cartFlushHubWarnings();
hgGateway();
// TODO REMOVE AFTER AUTOUPGRADE COMPLETE: (added 2014-03-09)
if (dyUpgradeError)
warn("%s", dyUpgradeError->string);
cartWebEnd();
}
static void checkForGeoMirrorRedirect()
{
// Implement Geo/IP based redirection
//
// NOTE that we want to redirect people as quickly as possible, so for efficiency purposes, this code is designed to be
// called from main BEFORE the cart is loaded (so we only use CGI parameters and/or cookies).