src/hg/lib/customFactory.c 1.99

Index: src/hg/lib/customFactory.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/customFactory.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -b -B -U 4 -r1.98 -r1.99
--- src/hg/lib/customFactory.c	30 Jul 2009 22:21:18 -0000	1.98
+++ src/hg/lib/customFactory.c	12 Aug 2009 21:20:26 -0000	1.99
@@ -1494,11 +1494,11 @@
 /* Load up wiggle data until get next track line. */
 {
 /* Not much to this.  A bigWig has nothing here but a track line. */
 struct hash *settings = track->tdb->settingsHash;
-char *dataUrl = hashFindVal(settings, "dataUrl");
-if (dataUrl == NULL)
-    errAbort("Missing dataUrl setting from track of type=bigWig");
+char *bigDataUrl = hashFindVal(settings, "bigDataUrl");
+if (bigDataUrl == NULL)
+    errAbort("Missing bigDataUrl setting from track of type=bigWig");
 return track;
 }
 
 static struct customFactory bigWigFactory = 
@@ -1526,11 +1526,11 @@
 /* Load up big bed data until get next track line. */
 {
 /* Not much to this.  A bigBed has nothing here but a track line. */
 struct hash *settings = track->tdb->settingsHash;
-char *dataUrl = hashFindVal(settings, "dataUrl");
-if (dataUrl == NULL)
-    errAbort("Missing dataUrl setting from track of type=bigBed");
+char *bigDataUrl = hashFindVal(settings, "bigDataUrl");
+if (bigDataUrl == NULL)
+    errAbort("Missing bigDataUrl setting from track of type=bigBed");
 return track;
 }
 
 static struct customFactory bigBedFactory = 
@@ -2067,25 +2067,10 @@
 	    if (dbTrack && oneTrack->dbTrackType != NULL)
 		ctAddToSettings(track, "dbTrackType", oneTrack->dbTrackType);
             if (!trackDbSetting(track->tdb, "inputType"))
                 ctAddToSettings(track, "inputType", fac->name);
-            /* dataUrl is unfortunately being used in two ways, 
-             *  bigBed and bigWig should have used their own variable name
-             * try to prevent stomping on dataUrl for bigBed and bigWig */
             if (dataUrl)
-		{
-		boolean updateDataUrl = TRUE;
-		if ( startsWith("bigBed", track->tdb->type) ||
-		     startsWith("bigWig", track->tdb->type) )
-		    {
-		    // we do not want to lose this
-                    // see compensating hack in ctDataUrl()
-		    if (trackDbSetting(track->tdb, "dataUrl"))
-			updateDataUrl = FALSE;
-		    }
-		if (updateDataUrl)
 		    ctAddToSettings(track, "dataUrl", dataUrl);
-		}
             if (!ctGenome(track) && ctDb)
                 ctAddToSettings(track, "db", ctDb);
 	    }
 	}
@@ -2188,18 +2173,18 @@
 
 static void touchUdcSettings(struct trackDb *tdb)
 /* Touch existing local udcCache bitmap and sparse files.  */
 {
-char *url = trackDbSetting(tdb, "dataUrl");
+char *url = trackDbSetting(tdb, "bigDataUrl");
 if (url)
     {
     struct slName *el, *list = udcFileCacheFiles(url, udcDefaultDir());
     for (el = list; el; el = el->next)
 	{
 	if (fileExists(el->name))
 	    {
 	    readAndIgnore(el->name);
-	    verbose(4, "setting dataUrl: %s\n", el->name);
+	    verbose(4, "setting bigDataUrl: %s\n", el->name);
 	    }
 	}
     slFreeList(&list);
     }
@@ -2273,9 +2258,9 @@
     /* Handle File* settings */
     isLive = (isLive && testFileSettings(track->tdb, fileName));
 
     
-    /* Handle dataUrl udc settings */
+    /* Handle bigDataUrl udc settings */
     touchUdcSettings(track->tdb);
 
     if (track->dbDataLoad)
 	/* Track was loaded into the database -- check if it still exists. */
@@ -2337,15 +2322,8 @@
 
 char *ctDataUrl(struct customTrack *ct)
 /* return URL where data can be reloaded, if any */
 {
-// hack to compensate for miss-use of variable name "dataUrl" in
-//  a different way than the rest of the code.
-//  see customFactoryParseOptionalDb() below.
-if ( startsWith("bigBed", ct->tdb->type) ||
-     startsWith("bigWig", ct->tdb->type) )
-    return NULL;
-
 return trackDbSetting(ct->tdb, "dataUrl");
 }
 
 char *ctHtmlUrl(struct customTrack *ct)