src/hg/hgTables/hgTables.c 1.193
1.193 2010/04/22 19:25:22 bristor
Added support for integration between the table browser and GREAT.
Index: src/hg/hgTables/hgTables.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTables/hgTables.c,v
retrieving revision 1.192
retrieving revision 1.193
diff -b -B -U 4 -r1.192 -r1.193
--- src/hg/hgTables/hgTables.c 13 Apr 2010 04:42:01 -0000 1.192
+++ src/hg/hgTables/hgTables.c 22 Apr 2010 19:25:22 -0000 1.193
@@ -1501,8 +1501,10 @@
dispatch(conn);
return;
}
}
+if (doGreat())
+ verifyGreatFormat(output);
if (sameString(output, outPrimaryTable))
{
if (doGalaxy() && !cgiOptionalString(hgtaDoGalaxyQuery))
sendParamsToGalaxy(hgtaDoTopSubmit, "get output");
@@ -1545,8 +1547,10 @@
else if (sameString(output, outWigBed))
{
if (doGalaxy() && !cgiOptionalString(hgtaDoGalaxyQuery))
sendParamsToGalaxy(hgtaDoTopSubmit, "get output");
+ else if (doGreat() && !cgiOptionalString(hgtaDoGreatQuery))
+ doGreatTopLevel();
else
doOutWigBed(track, table, conn);
}
else if (sameString(output, outMaf))
@@ -1676,9 +1680,9 @@
if (doGalaxy() && !cgiOptionalString(hgtaDoGalaxyQuery))
sendParamsToGalaxy(hgtaDoGenomicDna, "submit");
else
doGenomicDna(conn);
-else if (cartVarExists(cart, hgtaDoGetBed))
+else if (cartVarExists(cart, hgtaDoGetBed) || cartUsualBoolean(cart, hgtaDoGreatOutput, FALSE))
doGetBed(conn);
else if (cartVarExists(cart, hgtaDoGetCustomTrackTb))
doGetCustomTrackTb(conn);
else if (cartVarExists(cart, hgtaDoGetCustomTrackGb))
@@ -1762,11 +1765,14 @@
if (lookupPosition())
{
/* Init track and group lists and figure out what page to put up. */
initGroupsTracksTables();
+
+ if (cartUsualBoolean(cart, hgtaDoGreatOutput, FALSE))
+ doGetGreatOutput(dispatch);
+ else
dispatch();
}
-
/* Save variables. */
cartCheckout(&cart);
}