faf767571f701aec7738d97554b4cea24a1aa804
max
Fri Mar 27 05:57:53 2015 +0100
Revert "Removing GSAID code. BrianR said that's OK."
This reverts commit 324e56bb2fe619534c60a35706fb7bfc188c737f.
diff --git src/hg/hgNotYet/hgNotYet.c src/hg/hgNotYet/hgNotYet.c
index 6519b06..529a720 100644
--- src/hg/hgNotYet/hgNotYet.c
+++ src/hg/hgNotYet/hgNotYet.c
@@ -1,77 +1,83 @@
/* hgNotYet - Human Genome Browser. */
/* Copyright (C) 2011 The Regents of the University of California
* See README in this or parent directory for licensing information. */
#include "common.h"
#include "linefile.h"
#include "hash.h"
#include "cheapcgi.h"
#include "htmshell.h"
#include "obscure.h"
#include "web.h"
#include "cart.h"
#include "hdb.h"
#include "dbDb.h"
#include "hgFind.h"
#include "hCommon.h"
#include "hui.h"
#include "customTrack.h"
struct cart *cart = NULL;
struct hash *oldVars = NULL;
char *clade = NULL;
char *organism = NULL;
char *db = NULL;
void hgNotYet()
/* hgNotYet - Human Genome Browser. */
{
printf("The function you selected is currently under construction.
Please visit us again in the future.\n");
return;
}
void doMiddle(struct cart *theCart)
/* Set up pretty web display and save cart in global. */
{
char *scientificName = NULL;
cart = theCart;
getDbGenomeClade(cart, &db, &organism, &clade, oldVars);
if (! hDbIsActive(db))
{
db = hDefaultDb();
organism = hGenome(db);
clade = hClade(organism);
}
scientificName = hScientificName(db);
-
+if (hIsGisaidServer())
+ cartWebStart(theCart, db, "GISAID %s Genome Browser \n", organism);
+else if (hIsGsidServer())
+ cartWebStart(theCart, db, "GSID %s Genome Browser \n", organism);
+else
+ {
char buffer[128];
/* tell html routines *not* to escape htmlOut strings*/
htmlNoEscape();
buffer[0] = 0;
if (*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\n", organism, buffer, hBrowserName());
htmlDoEscape();
+ }
hgNotYet();
cartWebEnd();
}
char *excludeVars[] = {NULL};
int main(int argc, char *argv[])
/* Process command line. */
{
oldVars = hashNew(10);
cgiSpoof(&argc, argv);
cartEmptyShell(doMiddle, hUserCookie(), excludeVars, oldVars);
return 0;
}