07769f5e62216c125dc90df08dac7a90402c3fa4
markd
  Mon Jun 22 12:54:40 2015 -0700
add geneId to transmap gene table, with backwards compatibilty for current transmap tracks (RM 14574)

diff --git src/hg/inc/transMapGene.h src/hg/inc/transMapGene.h
index 9ff18a7..c674b2e 100644
--- src/hg/inc/transMapGene.h
+++ src/hg/inc/transMapGene.h
@@ -1,72 +1,73 @@
 /* transMapGene.h was originally generated by the autoSql program, which also 
  * generated transMapGene.c and transMapGene.sql.  This header links the database and
  * the RAM representation of objects. */
 
-/* Copyright (C) 2008 The Regents of the University of California 
- * See README in this or parent directory for licensing information. */
-
 #ifndef TRANSMAPGENE_H
 #define TRANSMAPGENE_H
 
-#define TRANSMAPGENE_NUM_COLS 4
+#define TRANSMAPGENE_NUM_COLS 5
+
+extern char *transMapGeneCommaSepFieldNames4;  // previous version without geneId column
+extern char *transMapGeneCommaSepFieldNames;
 
 struct transMapGene
-/* shared, gene-specific transMap information.  This is also a cdsSpec object */
+/* shared, gene-specific transMap information.  This is also a cds specification */
     {
     struct transMapGene *next;  /* Next in singly linked list. */
-    char *id;	/* unique sequence id */
+    char *id;	/* unique transcript id */
     char *cds;	/* CDS specification, in NCBI format. */
     char db[17];	/* source db */
     char *geneName;	/* gene name */
+    char *geneId;	/* database-specific gene id */
     };
 
 void transMapGeneStaticLoad(char **row, struct transMapGene *ret);
 /* Load a row from transMapGene table into ret.  The contents of ret will
  * be replaced at the next call to this function. */
 
 struct transMapGene *transMapGeneLoad(char **row);
 /* Load a transMapGene from row fetched with select * from transMapGene
  * from database.  Dispose of this with transMapGeneFree(). */
 
 struct transMapGene *transMapGeneLoadAll(char *fileName);
 /* Load all transMapGene from whitespace-separated file.
  * Dispose of this with transMapGeneFreeList(). */
 
 struct transMapGene *transMapGeneLoadAllByChar(char *fileName, char chopper);
 /* Load all transMapGene from chopper separated file.
  * Dispose of this with transMapGeneFreeList(). */
 
 #define transMapGeneLoadAllByTab(a) transMapGeneLoadAllByChar(a, '\t');
 /* Load all transMapGene from tab separated file.
  * Dispose of this with transMapGeneFreeList(). */
 
 struct transMapGene *transMapGeneCommaIn(char **pS, struct transMapGene *ret);
 /* Create a transMapGene out of a comma separated string. 
  * This will fill in ret if non-null, otherwise will
  * return a new transMapGene */
 
 void transMapGeneFree(struct transMapGene **pEl);
 /* Free a single dynamically allocated transMapGene such as created
  * with transMapGeneLoad(). */
 
 void transMapGeneFreeList(struct transMapGene **pList);
 /* Free a list of dynamically allocated transMapGene's */
 
 void transMapGeneOutput(struct transMapGene *el, FILE *f, char sep, char lastSep);
 /* Print out transMapGene.  Separate fields with sep. Follow last field with lastSep. */
 
 #define transMapGeneTabOut(el,f) transMapGeneOutput(el,f,'\t','\n');
 /* Print out transMapGene as a line in a tab-separated file. */
 
 #define transMapGeneCommaOut(el,f) transMapGeneOutput(el,f,',',',');
 /* Print out transMapGene as a comma separated list including final comma. */
 
 /* -------------------------------- End autoSql Generated Code -------------------------------- */
 
 struct transMapGene *transMapGeneQuery(struct sqlConnection *geneConn,
                                        char *table, char *srcDb, char *srcId);
 /* load a single transMapSrc object for an srcDb and srcId from a table,
  * or return NULL if not found */
 
 #endif /* TRANSMAPGENE_H */