a9d79df3cbd3f62b8607f053db951ccc0b7647da max Thu Mar 26 05:15:35 2015 -0700 previous commit was way overzealous, re-adding stubs for old gisaid code. Should have not touched this, sorry. diff --git src/hg/inc/hCommon.h src/hg/inc/hCommon.h index 7541aea..9c14674 100644 --- src/hg/inc/hCommon.h +++ src/hg/inc/hCommon.h @@ -1,25 +1,26 @@ /* hCommon.h - routines used by many files in hgap project. */ /* Copyright (C) 2013 The Regents of the University of California * See README in this or parent directory for licensing information. */ #ifndef HCOMMON_H #define HCOMMON_H #ifndef HGCOLORS_H #include "hgColors.h" +#include "cart.h" #endif char *hgcName(); /* Relative URL to click processing program. */ char *hgTracksName(); /* Relative URL to browser. */ char *hgTrackUiName(); /* Relative URL to extended track UI. */ char *hgFileUiName(); /* Relative URL to downloladable files UI. */ char *hgTextName(); @@ -67,75 +68,71 @@ void gsToUcsc(char *gsName, char *ucscName); /* Convert from * AC020585.5~1.2 Fragment 2 of 29 (AC020585.5:1..1195) * to * AC020585.5_1_2 */ char *skipChr(char *s); /* Skip leading 'chr' in string (to get the actual chromosome part). */ int chromToInt(char *s); /* converts a chrom name chrXX into an integer from 1 to 54. * X = 23 Y = 24 Un = 25 M = 26 random = chr + 26;*/ boolean hIsGisaidServer(); -/* Is this the GISAID-customized server? Change for config variable - * gisaid.server=yes */ - +/* Gisaid and Gsid are not used anymore */ boolean hIsGsidServer(); -/* Is this the GSID-customized server? Change for config variable - * gsid.server=yes */ +/* Gisaid and Gsid are not used anymore */ +boolean validateGisaidUser(); +/* Gisaid and Gsid are not used anymore */ boolean hIsCgbServer(); /* Is this a cancer genome browser server? Change for config variable * cgb.server=yes */ void hTableStart(); /* Output a table with solid borders. */ void hTableEnd(); /* Close out table started with hTableStart() */ #define hgDefaultPixWidth 800 #define DEFAULT_PIX_WIDTH "800" /* if this default pix width is changed, also note relationship in * CONTROL_TABLE_WIDTH in hui.h */ #define hgDefaultLeftLabelWidth 120 #define hgDefaultGfxBorder 1 -/* gisaid selection file option variable names */ -#define gisaidSubjList "gisaidTable.gisaidSubjList" -#define gisaidSeqList "gisaidTable.gisaidSeqList" -#define gisaidAaSeqList "gisaidTable.gisaidAaSeqList" - -boolean validateGisaidUser(); - boolean hDumpStackEnabled(void); /* is browser.dumpStack enabled? */ void hDumpStackDisallow(void); /* prevent any dumping of the stack */ void hDumpStackPushAbortHandler(void); /* push the stack dump abort handler on the stack if it's enabled. This should be pushed * after the warn handle that will do the actual reporting */ void hDumpStackPopAbortHandler(void); /* pop the stack dump abort handler from the stack if it's enabled */ void hVaUserAbort(char *format, va_list args); /* errAbort when a `user' error is detected. This is an error that comes * from user input. This disables the logging stack dumps. */ void hUserAbort(char *format, ...) /* errAbort when a `user' error is detected. This is an error that comes * from user input. This disables the logging stack dumps. */ #if defined(__GNUC__) __attribute__((format(printf, 1, 2))) #endif ; boolean hAllowAllTables(void); /* Return TRUE if hg.conf's hgta.disableAllTables doesn't forbid an 'all tables' menu. */ +void hCgiStartSetup(struct cart *cart); +/* do the CGI setup operations: CGI apoptosis, UDC setup etc + * usually called at the start of the doMiddle function */ + #endif /* HCOMMON_H */