54a82789a7709e5ad9cdc18dcc5691936bc8b516 braney Thu Aug 9 15:36:55 2012 -0700 remove some routines used only by the proteome browser (#5740) diff --git src/hg/lib/cart.c src/hg/lib/cart.c index 388bc31..cce6b95 100644 --- src/hg/lib/cart.c +++ src/hg/lib/cart.c @@ -1608,77 +1608,30 @@ void cartEmptyShell(void (*doMiddle)(struct cart *cart), char *cookieName, char **exclude, struct hash *oldVars) /* Get cart and cookies and set up error handling, but don't start writing any * html yet. The doMiddleFunction has to call cartHtmlStart(title), and * cartHtmlEnd(), as well as writing the body of the HTML. * oldVars - those in cart that are overlayed by cgi-vars are * put in optional hash oldVars. */ { struct cart *cart = cartAndCookie(cookieName, exclude, oldVars); setThemeFromCart(cart); cartWarnCatcher(doMiddle, cart, cartEarlyWarningHandler); cartCheckout(&cart); } -void cartHtmlShellPB(char *title, void (*doMiddle)(struct cart *cart), - char *cookieName, char **exclude, struct hash *oldVars) -/* For Proteome Browser, Load cart from cookie and session cgi variable. Write web-page - * preamble, call doMiddle with cart, and write end of web-page. - * Exclude may be NULL. If it exists it's a comma-separated list of - * variables that you don't want to save in the cart between - * invocations of the cgi-script. */ -{ -struct cart *cart; -char *db, *org; -char titlePlus[128]; -char *proteinID; -pushWarnHandler(cartEarlyWarningHandler); -cart = cartAndCookie(cookieName, exclude, oldVars); -getDbAndGenome(cart, &db, &org, oldVars); -proteinID = cartOptionalString(cart, "proteinID"); -safef(titlePlus, sizeof(titlePlus), "%s protein %s - %s", org, proteinID, title); -popWarnHandler(); -htmStart(stdout, titlePlus); -cartWarnCatcher(doMiddle, cart, htmlVaWarn); -cartCheckout(&cart); -cartFooter(); -} - -void cartHtmlShellPbGlobal(char *title, void (*doMiddle)(struct cart *cart), - char *cookieName, char **exclude, struct hash *oldVars) -/* For Proteome Browser, Load cart from cookie and session cgi variable. Write web-page - * preamble, call doMiddle with cart, and write end of web-page. - * Exclude may be NULL. If it exists it's a comma-separated list of - * variables that you don't want to save in the cart between - * invocations of the cgi-script. */ -/* cartHtmlShellPbGloabl differs from cartHtmlShellPB that it does not call getDbAndGenome */ -{ -struct cart *cart; -char titlePlus[128]; -char *proteinID; -pushWarnHandler(cartEarlyWarningHandler); -cart = cartAndCookie(cookieName, exclude, oldVars); -proteinID = cartOptionalString(cart, "proteinID"); -safef(titlePlus, sizeof(titlePlus), "Protein %s - %s", proteinID, title); -popWarnHandler(); -htmStart(stdout, titlePlus); -cartWarnCatcher(doMiddle, cart, htmlVaWarn); -cartCheckout(&cart); -cartFooter(); -} - void cartHtmlShell(char *title, void (*doMiddle)(struct cart *cart), char *cookieName, char **exclude, struct hash *oldVars) /* Load cart from cookie and session cgi variable. Write web-page * preamble, call doMiddle with cart, and write end of web-page. * Exclude may be NULL. If it exists it's a comma-separated list of * variables that you don't want to save in the cart between * invocations of the cgi-script. */ { cartHtmlShellWithHead("", title, doMiddle, cookieName, exclude, oldVars); } void cartSetDbConnector(DbConnector connector) /* Set the connector that will be used by the cart to connect to the * database. Default connector is hConnectCart */ {