235301fd42a93e1ba15678074735ca2ce7ffe3d6 Merge parents caa4f9e ffae904 tdreszer Fri Dec 2 11:08:58 2011 -0800 Merge branch 'master' into tdreszer-subCfg diff --cc src/hg/lib/pal.c index 719a00d,2e86497..90c4598 --- src/hg/lib/pal.c +++ src/hg/lib/pal.c @@@ -1,40 -1,39 +1,39 @@@ #include "common.h" #include "hash.h" #include "cart.h" #include "genePred.h" #include "genePredReader.h" #include "mafGene.h" #include "trackDb.h" #include "hdb.h" #include "hgMaf.h" #include "jsHelper.h" #include "hPrint.h" #include "hdb.h" - static char const rcsid[] = "$Id: pal.c,v 1.14 2009/07/06 17:43:08 braney Exp $"; -#define hgtaCGIGeneMafTable "hgta_mafGeneMafTable" -#define hgtaJSGeneMafTable "mafGeneMafTable" -#define hgtaCGIGeneExons "hgta_mafGeneExons" -#define hgtaJSGeneExons "mafGeneExons" -#define hgtaCGIGeneNoTrans "hgta_mafGeneNoTrans" -#define hgtaJSGeneNoTrans "mafGeneNoTrans" -#define hgtaCGIGeneOutBlank "hgta_mafGeneOutBlank" -#define hgtaJSGeneOutBlank "mafGeneOutBlank" -#define hgtaCGIOutTable "hgta_mafOutTable" -#define hgtaJSOutTable "mafOutTable" +#define hgtaCGIGeneMafTable "hgta_mafGeneMafTable" +#define hgtaJSGeneMafTable "mafGeneMafTable" +#define hgtaCGIGeneExons "hgta_mafGeneExons" +#define hgtaJSGeneExons "mafGeneExons" +#define hgtaCGIGeneNoTrans "hgta_mafGeneNoTrans" +#define hgtaJSGeneNoTrans "mafGeneNoTrans" +#define hgtaCGIGeneOutBlank "hgta_mafGeneOutBlank" +#define hgtaJSGeneOutBlank "mafGeneOutBlank" +#define hgtaCGIOutTable "hgta_mafOutTable" +#define hgtaJSOutTable "mafOutTable" #define hgtaCGINumColumns "hgta_mafNumColumns" #define hgtaJSNumColumns "mafNumColumns" #define hgtaCGITruncHeader "hgta_mafTruncHeader" #define hgtaJSTruncHeader "mafTruncHeader" static char *curVars[] = { hgtaCGIGeneMafTable, hgtaCGIGeneExons, hgtaCGIGeneNoTrans, hgtaCGIGeneOutBlank, hgtaCGIOutTable, hgtaCGINumColumns, hgtaCGITruncHeader, }; int palOutPredList(struct sqlConnection *conn, struct cart *cart, struct genePred *list) /* output a list of genePreds in pal format */