965d1048e8671fb3a5630fe75deb88f24df386d7
kate
  Wed Aug 13 15:01:59 2014 -0700
Expand schema for GTex.  Create tissue short names and use these in sample and data tables. refs #13504
diff --git src/hg/inc/gtexSample.h src/hg/inc/gtexSample.h
index 267facc..dde1e30 100644
--- src/hg/inc/gtexSample.h
+++ src/hg/inc/gtexSample.h
@@ -1,69 +1,68 @@
 /* gtexSample.h was originally generated by the autoSql program, which also 
  * generated gtexSample.c and gtexSample.sql.  This header links the database and
  * the RAM representation of objects. */
 
 #ifndef GTEXSAMPLE_H
 #define GTEXSAMPLE_H
 
-#define GTEXSAMPLE_NUM_COLS 4
+#define GTEXSAMPLE_NUM_COLS 3
 
 extern char *gtexSampleCommaSepFieldNames;
 
 struct gtexSample
 /* GTEx sample description */
     {
     struct gtexSample *next;  /* Next in singly linked list. */
-    unsigned id;	/* internal id */
-    char *tissue;	/* GTEX tissue description */
-    char *donor;	/* GTEX donor name */
-    char *name;	/* GTEX sample name */
+    char *name;	/* GTEX sample identifier */
+    char *tissue;	/* Tissue name */
+    char *donor;	/* GTEX subject identifier */
     };
 
 void gtexSampleStaticLoad(char **row, struct gtexSample *ret);
 /* Load a row from gtexSample table into ret.  The contents of ret will
  * be replaced at the next call to this function. */
 
 struct gtexSample *gtexSampleLoad(char **row);
 /* Load a gtexSample from row fetched with select * from gtexSample
  * from database.  Dispose of this with gtexSampleFree(). */
 
 struct gtexSample *gtexSampleLoadAll(char *fileName);
 /* Load all gtexSample from whitespace-separated file.
  * Dispose of this with gtexSampleFreeList(). */
 
 struct gtexSample *gtexSampleLoadAllByChar(char *fileName, char chopper);
 /* Load all gtexSample from chopper separated file.
  * Dispose of this with gtexSampleFreeList(). */
 
 #define gtexSampleLoadAllByTab(a) gtexSampleLoadAllByChar(a, '\t');
 /* Load all gtexSample from tab separated file.
  * Dispose of this with gtexSampleFreeList(). */
 
 struct gtexSample *gtexSampleCommaIn(char **pS, struct gtexSample *ret);
 /* Create a gtexSample out of a comma separated string. 
  * This will fill in ret if non-null, otherwise will
  * return a new gtexSample */
 
 void gtexSampleFree(struct gtexSample **pEl);
 /* Free a single dynamically allocated gtexSample such as created
  * with gtexSampleLoad(). */
 
 void gtexSampleFreeList(struct gtexSample **pList);
 /* Free a list of dynamically allocated gtexSample's */
 
 void gtexSampleOutput(struct gtexSample *el, FILE *f, char sep, char lastSep);
 /* Print out gtexSample.  Separate fields with sep. Follow last field with lastSep. */
 
 #define gtexSampleTabOut(el,f) gtexSampleOutput(el,f,'\t','\n');
 /* Print out gtexSample as a line in a tab-separated file. */
 
 #define gtexSampleCommaOut(el,f) gtexSampleOutput(el,f,',',',');
 /* Print out gtexSample as a comma separated list including final comma. */
 
 /* -------------------------------- End autoSql Generated Code -------------------------------- */
 
 void gtexSampleCreateTable(struct sqlConnection *conn, char *table);
 /* Create expression record format table of given name. */
 
 #endif /* GTEXSAMPLE_H */