src/hg/hgTracks/hgTracks.c 1.1576
1.1576 2009/06/26 14:49:43 fanhsu
Added logic to check user authentication for the GISAID server. For other servers,
a dummy/empty validation function is called, which just pass thru.
Index: src/hg/hgTracks/hgTracks.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/hgTracks.c,v
retrieving revision 1.1575
retrieving revision 1.1576
diff -b -B -U 4 -r1.1575 -r1.1576
--- src/hg/hgTracks/hgTracks.c 25 Jun 2009 08:43:07 -0000 1.1575
+++ src/hg/hgTracks/hgTracks.c 26 Jun 2009 14:49:43 -0000 1.1576
@@ -2922,10 +2922,13 @@
{
/* disable hgGateway for gisaid for now */
//hPrintf("<TD ALIGN=CENTER><A HREF=\"../cgi-bin/hgGateway?org=%s&db=%s\" class=\"topbar\">Sequence View Gateway</A></TD>", orgEnc, database);
hPrintf(
- "<TD ALIGN=CENTER><A HREF=\"../cgi-bin/gisaidTable?gisaidTable.do.advFilter=filter+%c28now+on%c29&fromProg=hgTracks\" class=\"topbar\">%s</A></TD>",
- '%', '%', "Select Subjects");
+ "<TD ALIGN=CENTER><A HREF=\"../cgi-bin/gisaidTable?gisaidTable.do.advFilter=filter+%c28now+on%c29&fromProg=hgTracks&%s=%u\" class=\"topbar\">%s</A></TD>",
+ '%', '%',
+ cartSessionVarName(),
+ cartSessionId(cart),
+ "Select Subjects");
}
else
if (hIsGsidServer())
{
@@ -2943,10 +2946,13 @@
hPrintf("<TD ALIGN=CENTER><A HREF=\"../cgi-bin/hgBlat?%s\" class=\"topbar\">Blat</A></TD>", uiVars->string);
}
if (hIsGisaidServer())
{
- hPrintf("<TD ALIGN=CENTER><A HREF=\"../cgi-bin/gisaidTable?db=%s\" class=\"topbar\">%s</A></TD>",
- database, "Table View");
+ hPrintf("<TD ALIGN=CENTER><A HREF=\"../cgi-bin/gisaidTable?db=%s&%s=%u\" class=\"topbar\">%s</A></TD>",
+ database,
+ cartSessionVarName(),
+ cartSessionId(cart),
+ "Table View");
}
else
if (hIsGsidServer())
{
@@ -2958,10 +2964,12 @@
/* disable TB for CGB servers */
if (!hIsCgbServer())
{
hPrintf("<TD ALIGN=CENTER><A HREF=\"../cgi-bin/hgTables?db=%s&position=%s:%d-%d&%s=%u\" class=\"topbar\">%s</A></TD>",
- database, chromName, winStart+1, winEnd, cartSessionVarName(),
- cartSessionId(cart), "Tables");
+ database, chromName, winStart+1, winEnd,
+ cartSessionVarName(),
+ cartSessionId(cart),
+ "Tables");
}
}
if (hgNearOk(database))
@@ -4653,8 +4661,13 @@
hgDebug = TRUE;
else
hgDebug = FALSE;
+if (hIsGisaidServer())
+ {
+ validateGisaidUser(cart);
+ }
+
setUdcCacheDir();
initTl();
measureTiming = isNotEmpty(cartOptionalString(cart, "measureTiming"));