a66e5b2a57c0b09f17ffa214370a7371877b4a83
kent
  Thu Jan 6 19:11:11 2011 -0800
Fixing conflicts from merging with master.
diff --git src/hg/lib/trackHub.c src/hg/lib/trackHub.c
index 5ef46ef..5fcecdd 100644
--- src/hg/lib/trackHub.c
+++ src/hg/lib/trackHub.c
@@ -246,31 +246,31 @@
 
 }
 
 struct trackHubGenome *trackHubFindGenome(struct trackHub *hub, char *genomeName)
 /* Return trackHubGenome of given name associated with hub.  Return NULL if no
  * such genome. */
 {
 return hashFindVal(hub->genomeHash, genomeName);
 }
 
 struct trackDb *trackHubTracksForGenome(struct trackHub *hub, struct trackHubGenome *genome)
 /* Get list of tracks associated with genome.  Check that it only is composed of legal
  * types.  Do a few other quick checks to catch errors early. */
 {
 struct lineFile *lf = udcWrapShortLineFile(genome->trackDbFile, NULL, 16*1024*1024);
-struct trackDb *tdbList = trackDbFromOpenRa(lf);
+struct trackDb *tdbList = trackDbFromOpenRa(lf, NULL);
 lineFileClose(&lf);
 
 /* Make bigDataUrls more absolute rather than relative to genome.ra dir */
 struct trackDb *tdb;
 for (tdb = tdbList; tdb != NULL; tdb = tdb->next)
     expandBigDataUrl(hub, genome, tdb);
 
 /* Connect up subtracks and parents.  Note this loop does not actually move tracks
  * from list to parent subtracks, it just uses the field as a marker. Just do this
  * so when doing error checking can distinguish between container tracks and others.
  * This does have the pleasant side effect of making good error messages for
  * non-existant parents. */
 struct hash *hash = hashNew(0);
 for (tdb = tdbList; tdb != NULL; tdb = tdb->next)
     hashAdd(hash, tdb->track, tdb);