00d6b45fd33ab330efcf6d6b88b0d6e9a7880281
kent
  Thu Oct 28 14:54:35 2010 -0700
Redoing dataHub using new trackHub library routines.  Still pretty embryonic, but once again is displaying a couple of tracks for me, this time ones that are genuinely remote. Code is activated by having a 'tracksHub' variable in the cart, which currently is only possible by hacking with cartDump.
diff --git src/hg/hgTracks/bigWigTrack.c src/hg/hgTracks/bigWigTrack.c
index 7eac8ac..9a36e74 100644
--- src/hg/hgTracks/bigWigTrack.c
+++ src/hg/hgTracks/bigWigTrack.c
@@ -63,46 +63,46 @@
     freeMem(preDrawList->preDraw);
     freeMem(preDrawList);
     }
 freeMem(summary);
 }
 
 static void bigWigLoadItems(struct track *tg)
 /* Fill up tg->items with bedGraphItems derived from a bigWig file */
 {
 char *extTableString = trackDbSetting(tg->tdb, "extTable");
 
 if (extTableString != NULL)
     {
     // if there's an extra table, read this one in too
     struct sqlConnection *conn = hAllocConnTrack(database, tg->tdb);
-    char *fileName = bbiNameFromTable(conn, tg->table);
+    char *fileName = bbiNameFromSettingOrTable(tg->tdb, conn, tg->table);
     struct bbiFile *bbiFile = bigWigFileOpen(fileName);
     slAddHead(&tg->bbiFile, bbiFile);
 
-    fileName = bbiNameFromTable(conn, extTableString);
+    fileName = bbiNameFromSettingOrTable(tg->tdb, conn, extTableString);
     bbiFile = bigWigFileOpen(fileName);
     slAddHead(&tg->bbiFile, bbiFile);
 
     hFreeConn(&conn);
     }
 else
     {
     if (tg->bbiFile == NULL)
 	{
 	/* Figure out bigWig file name. */
 	struct sqlConnection *conn = hAllocConnTrack(database, tg->tdb);
-	char *fileName = bbiNameFromTable(conn, tg->table);
+	char *fileName = bbiNameFromSettingOrTable(tg->tdb, conn, tg->table);
 	tg->bbiFile = bigWigFileOpen(fileName);
 	hFreeConn(&conn);
 	}
     }
 }
 
 void bigWigMethods(struct track *track, struct trackDb *tdb, 
 	int wordCount, char *words[])
 /* Set up bigWig methods. */
 {
 bedGraphMethods(track, tdb, wordCount, words);
 track->loadItems = bigWigLoadItems;
 track->drawItems = bigWigDrawItems;
 }