src/hg/protein/pbGateway/pbGateway.c 1.10

Index: src/hg/protein/pbGateway/pbGateway.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/protein/pbGateway/pbGateway.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -B -U 1000000 -r1.9 -r1.10
--- src/hg/protein/pbGateway/pbGateway.c	3 Sep 2008 19:21:00 -0000	1.9
+++ src/hg/protein/pbGateway/pbGateway.c	25 Jun 2009 08:43:09 -0000	1.10
@@ -1,99 +1,96 @@
 /* pbGateway - Human Proteome Browser Gateway. */
 #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"
 
 struct cart *cart = NULL;
 struct hash *oldVars = NULL;
 static char * const orgCgiName = "org";
 static char * const dbCgiName = "db";
 char *organism = NULL;
 char *db = NULL;
 
 void pbGateway()
 /* pbGateway - Human Proteome Browser Gateway. */
 {
 char *defaultPosition = hDefaultPos(db);
 char *position = cloneString(cartUsualString(cart, "position", defaultPosition));
 
 if (sameString(position, "proteome") || sameString(position, "genome") ||
     sameString(position, "hgBatch"))
     position = defaultPosition;
 
 puts(
 "<FORM ACTION=\"../cgi-bin/pbGlobal\" NAME=\"mainForm\" METHOD=\"GET\">\n"
 "<CENTER>"
 "<TABLE BGCOLOR=\"FFFEF3\" BORDERCOLOR=\"cccc99\" BORDER=0 CELLPADDING=1>\n"
 "<TR><TD><FONT SIZE=\"2\">\n"
 "<CENTER>\n"
 "The UCSC Proteome Browser was created by the \n"
 "<A HREF=\"../staff.html\">Genome Bioinformatics Group of UC Santa Cruz</A>.\n"
 "<BR>"
 "Software Copyright (c) The Regents of the University of California.\n"
 "All rights reserved.\n"
 "</CENTER>\n"
 "</FONT></TD></TR></TABLE></CENTER>\n"
 );
 
 puts("<BR><B>Enter a gene symbol or a Swiss-Prot/TrEMBL protein ID: </B>");
 puts("<input type=\"text\" name=\"proteinID\" >\n");
 puts("<INPUT TYPE=SUBMIT>");
 
 puts("</FORM>\n"
 );
 
 printf("<FORM ACTION=\"../cgi-bin/pbGateway\" METHOD=\"GET\" NAME=\"orgForm\"><input type=\"hidden\" name=\"org\" value=\"%s\">\n", organism);
 printf("<input type=\"hidden\" name=\"db\" value=\"%s\">\n", db);
 cartSaveSession(cart);
 puts("</FORM><BR>");
 }
 
 void doMiddle(struct cart *theCart)
 /* Set up pretty web display and save cart in global. */
 {
 cart = theCart;
 
 getDbAndGenome(cart, &db, &organism, oldVars);
 if (! hDbIsActive(db))
     {
     db = hDefaultDb();
     organism = hGenome(db);
     }
-if (hIsMgcServer())
-    cartWebStart(theCart, NULL, "MGC Proteome Browser Gateway \n");
-else
-    cartWebStart(theCart, NULL, "UCSC Proteome Browser Gateway \n");
+cartWebStart(theCart, NULL, "UCSC Proteome Browser Gateway \n");
 
 /* start with a clean slate */
 cartResetInDb(hUserCookie());  
 /* This cartResetInDb does nothing since database will be overwritten
  * with memory by cartWebEnd ... unless pgGateway crashes, in which
  * case along with the crash it will wipe out all the users settings.
  * Is that a nice thing to do?  -Jim */
           
 
 pbGateway();
 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;
 }