7fdfab0ba90789194773f2bbd31bcc6ab161631a galt Tue Aug 5 10:57:28 2014 -0700 Fixes #12559. GenomeSpace support added to hgTables. diff --git src/hg/hgTables/hgTables.h src/hg/hgTables/hgTables.h index b232453..1aa95dc 100644 --- src/hg/hgTables/hgTables.h +++ src/hg/hgTables/hgTables.h @@ -426,30 +426,33 @@ #define hgtaDoPrintSelectedFields "hgta_doPrintSelectedFields" #define hgtaDoGalaxySelectedFields "hgta_doGalaxySelectedFields" #define hgtaDoSelectFieldsMore "hgta_doSelectFieldsMore" #define hgtaDoClearAllFieldPrefix "hgta_doClearAllField." #define hgtaDoSetAllFieldPrefix "hgta_doSetAllField." #define hgtaDoGenePredSequence "hgta_doGenePredSequence" #define hgtaDoGenomicDna "hgta_doGenomicDna" #define hgtaDoGetBed "hgta_doGetBed" #define hgtaDoGetCustomTrackGb "hgta_doGetCustomTrackGb" #define hgtaDoGetCustomTrackTb "hgta_doGetCustomTrackTb" #define hgtaDoGetCustomTrackFile "hgta_doGetCustomTrackFile" #define hgtaDoRemoveCustomTrack "hgta_doRemoveCustomTrack" #define hgtaDoGalaxyQuery "hgta_doGalaxyQuery" #define hgtaDoGreatOutput "hgta_doGreatOutput" #define hgtaDoGreatQuery "hgta_doGreatQuery" +#define hgtaDoGsLogin "hgta_doGsLogin" +#define hgtaGsUser "hgta_gsUser" +#define hgtaGsPassword "hgta_gsPassword" #define hgtaDoLookupPosition "hgta_doLookupPosition" #define hgtaDoMetaData "hgta_doMetaData" #define hgtaDoSetUserRegions "hgta_doSetUserRegions" #define hgtaDoClearSetUserRegionsText "hgta_doClearSetUserRegionsText" #define hgtaUserRegionsFile "hgta_userRegionsFile" #define hgtaUserRegionsTable "hgta_userRegionsTable" #define hgtaUserRegionsDb "hgta_userRegionsDb" #define hgtaEnteredUserRegions "hgta_enteredUserRegions" #define hgtaEnteredUserRegionFile "hgta_enteredUserRegionFile" #define hgtaDoSubmitUserRegions "hgta_doSubmitUserRegions" #define hgtaDoClearUserRegions "hgta_doClearUserRegions" #define hgtaRegionTypeUserRegions "userRegions" #define hgtaRegionTypeEncode "encode" #define hgtaRegionTypeGenome "genome" #define hgtaRegionTypeRange "range" @@ -1120,30 +1123,51 @@ void verifyGreatAssemblies(); /* check that specified assembly is acceptable for GREAT; errAbort if not */ void printGreatSubmitButtons(); /* print submit button to send query results to GREAT */ void startGreatForm(); /* start form to send parameters to GREAT, also send required params */ void doGetGreatOutput(void (*dispatch)()); /* Generate output that GREAT will read via doGetGreatResults. */ void doGreatTopLevel(); /* intermediate page for sending to GREAT directly from top form */ +/* --------------- GenomeSpace functions --------------- */ +boolean doGenomeSpace(); +/* Has the send query results to GenomeSpace checkbox been selected? */ + +boolean checkGsReady(); +/* check that GS requirements are met */ + +void doGsLogin(struct sqlConnection *conn); +/* Process user password post. */ + +void gsSendToDM(); +/* upload the generated file to DM */ + +void getBackgroundStatus(char *url); +/* fetch status as the latest complete html block available */ + +void startBackgroundWork(char *exec, char **pWorkUrl); +/* deal with forking off child for background work + * and setting up the trash file for communicating + * from the child to the browser */ + /* --------------- wikiTrack functions --------------- */ void wikiTrackDb(struct trackDb **list); /* create a trackDb entry for the wiki track */ struct hTableInfo *wikiHti(); /* Create an hTableInfo for the wikiTrack. */ void doSummaryStatsWikiTrack(struct sqlConnection *conn); /* Put up page showing summary stats for wikiTrack. */ struct bed *wikiTrackGetFilteredBeds(char *name, struct region *regionList, struct lm *lm, int *retFieldCount); /* Get list of beds from the wikiTrack * in current regions and that pass * filters. You can bedFree this when done. */