ba8d45a98b6ae5f73493192b0eb0767dbb4f4dd8
Merge parents 5ccbeee a6f9e0e
kate
  Thu Apr 13 14:49:10 2017 -0700
Fixing merge conflict

diff --cc src/hg/lib/trackHub.c
index 9adacd1,8c1d862..442b950
--- src/hg/lib/trackHub.c
+++ src/hg/lib/trackHub.c
@@@ -757,48 -757,50 +757,50 @@@
      char *superTrack = trackDbSetting(tdb, "superTrack");
      if ((superTrack != NULL) && startsWith("on", superTrack))
  	isSuper = TRUE;
  
      if (!(trackDbSetting(tdb, "compositeTrack") ||
            trackDbSetting(tdb, "container") || 
  	  isSuper))
          {
  	errAbort("Parent track %s is not compositeTrack, container, or superTrack in hub %s genome %s", 
  		tdb->track, hub->url, genome->name);
  	}
      }
  else
      {
      /* Check type field. */
+     // KRR FIX: table lookup
      char *type = requiredSetting(hub, genome, tdb, "type");
      if (!(startsWithWord("bigWig", type) ||
            startsWithWord("bigBed", type) ||
  #ifdef USE_HAL
            startsWithWord("pslSnake", type) ||
            startsWithWord("halSnake", type) ||
  #endif
            startsWithWord("vcfTabix", type) ||
            startsWithWord("bigPsl", type) ||
            startsWithWord("bigMaf", type) ||
            startsWithWord("longTabix", type) ||
            startsWithWord("bigGenePred", type) ||
            startsWithWord("bigChain", type) ||
+           startsWithWord("bigBarChart", type) ||
            startsWithWord("bam", type)))
 -	{
 -	errAbort("Unsupported type '%s' in hub %s genome %s track %s", type,
 -	    hub->url, genome->name, tdb->track);
 -	}
 +        {
 +        errAbort("Unsupported type '%s' in hub %s genome %s track %s", type,
 +            hub->url, genome->name, tdb->track);
 +        }
  
      requiredSetting(hub, genome, tdb, "bigDataUrl");
      }
  }
  
  static void markContainers( struct trackHub *hub, 
      struct trackHubGenome *genome, struct trackDb *tdbList)
  /* Mark containers that are parents, or have them. */
  {
  struct hash *hash = hashNew(0);
  struct trackDb *tdb;
  
  // add all the track names to a hash
  for (tdb = tdbList; tdb != NULL; tdb = tdb->next)
      {