957f2123050742982ef6c7aefcab70d29144924c
braney
  Mon Oct 9 17:49:04 2017 -0700
allow bedGraph. Change names in collections so they don't match names in
trackDb, move the copying of custom tracks and collections to BEFORE the
load of trackHubs, misc other bugs

diff --git src/hg/lib/trackHub.c src/hg/lib/trackHub.c
index c2c708f..2bb3d05 100644
--- src/hg/lib/trackHub.c
+++ src/hg/lib/trackHub.c
@@ -788,31 +788,31 @@
     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. */
     char *type = requiredSetting(hub, genome, tdb, "type");
-    if (!( isCustomComposite(tdb) && startsWithWord("wig", type)))
+    if (!( isCustomComposite(tdb) && (startsWithWord("wig", type) ||  startsWithWord("bedGraph", type))))
         {
         if (startsWithWord("mathWig", type) )
             {
             requiredSetting(hub, genome, tdb, "mathDataUrl");
             }
         else 
             {
             if (!startsWithWord("wig", type) )
                 {
                 if (!(startsWithWord("bigWig", type) ||
                   startsWithWord("bigBed", type) ||
 #ifdef USE_HAL
                   startsWithWord("pslSnake", type) ||
                   startsWithWord("halSnake", type) ||
 #endif