a66e5b2a57c0b09f17ffa214370a7371877b4a83
kent
  Thu Jan 6 19:11:11 2011 -0800
Fixing conflicts from merging with master.
diff --git src/hg/inc/trackDb.h src/hg/inc/trackDb.h
index 336fc79..c9054d7 100644
--- src/hg/inc/trackDb.h
+++ src/hg/inc/trackDb.h
@@ -1,27 +1,32 @@
 /* trackDb.h was originally generated by the autoSql program, which also
  * generated trackDb.c and trackDb.sql.  This header links the database and
  * the RAM representation of objects. */
 
 #ifndef TRACKDB_H
 #define TRACKDB_H
 
 #include "common.h"
+
 #ifndef JKSQL_H
 #include "jksql.h"
 #endif
 
+#ifndef LINEFILE_H
+#include "linefile.h"
+#endif
+
 #define TRACKDB_NUM_COLS 21
 
 struct trackDb
 /* This describes an annotation track. */
     {
     struct trackDb *next;  /* Next in singly linked list.  Next sibling in tree. */
     char *track; /* Symbolic ID of Track - used in cart. Is tableName in database historically. */
     char *table; /* Symbolic ID of Table - used in database. Same as track usually. */
     char *shortLabel;	/* Short label displayed on left */
     char *type;	/* Track type: bed, psl, genePred, etc. */
     char *longLabel;	/* Long label displayed in middle */
     unsigned char visibility;	/* 0=hide, 1=dense, 2=full, 3=pack, 4=squish */
     float priority;	/* 0-100 - where to position.  0 is top */
     unsigned char colorR;	/* Color red component 0-255 */
     unsigned char colorG;	/* Color green component 0-255 */
@@ -282,34 +287,36 @@
 #define trackDbCommaOut(el,f) trackDbOutput(el,f,',',',');
 /* Print out trackDb as a comma separated list including final comma. */
 
 /* ----------- End of AutoSQL generated code --------------------- */
 
 struct trackDb *trackDbNew();
 /* Allocate a new trackDb with just very minimal stuff filled in. */
 
 int trackDbCmp(const void *va, const void *vb);
 /* Sort track by priority. */
 
 void trackDbOverridePriority(struct hash *tdHash, char *priorityRa);
 /* Override priority settings using a ra file. */
 
 struct trackDb *trackDbFromRa(char *raFile, char *releaseTag);
-/* Load track info from ra file into list. */
+/* Load track info from ra file into list.  If releaseTag is non-NULL
+ * then only load tracks that mesh with release. */
 
-struct trackDb *trackDbFromOpenRa(struct lineFile *lf);
-/* Load track info from ra file already opened as a lineFile into list. */
+struct trackDb *trackDbFromOpenRa(struct lineFile *lf, char *releaseTag);
+/* Load track info from ra file already opened as lineFile into list.  If releaseTag is 
+ * non-NULL then only load tracks that mesh with release. */
 
 void trackDbPolish(struct trackDb *bt);
 /* Fill in missing values with defaults. */
 
 void trackDbFieldsFromSettings(struct trackDb *td);
 /* Update trackDb fields from settings hash */
 
 char *trackDbLocalSetting(struct trackDb *tdb, char *name);
 /* Return setting from tdb, but *not* any of it's parents. */
 
 struct hash *trackDbHashSettings(struct trackDb *tdb);
 /* Force trackDb to hash up it's settings.  Usually this is just
  * done on demand. Returns settings hash. */
 
 struct hash *trackDbSettingsFromString(char *string);