src/hg/lib/hui.c 1.295

Index: src/hg/lib/hui.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/hui.c,v
retrieving revision 1.294
retrieving revision 1.295
diff -b -B -U 4 -r1.294 -r1.295
--- src/hg/lib/hui.c	24 May 2010 20:34:22 -0000	1.294
+++ src/hg/lib/hui.c	26 May 2010 22:21:30 -0000	1.295
@@ -46,28 +46,28 @@
 #define ENCODE_DCC_DOWNLOADS "encodeDCC"
 
 
 
-static boolean makeNamedDownloadsLink(struct trackDb *tdb,char *name)
+static boolean makeNamedDownloadsLink(char *database, struct trackDb *tdb,char *name)
 // Make a downloads link (if appropriate and then returns TRUE)
 {
 // Downloads directory if this is ENCODE
 if(trackDbSetting(tdb, "wgEncode") != NULL)
     {
     printf("<A HREF=\"http://%s/goldenPath/%s/%s/%s/\" title='Open downloads directory in a new window' TARGET=ucscDownloads>%s</A>",
             hDownloadsServer(),
-            trackDbSettingOrDefault(tdb, "origAssembly","hg18"),
+            trackDbSettingOrDefault(tdb, "origAssembly",database),
             ENCODE_DCC_DOWNLOADS,
             tdb->track,name);
     return TRUE;
     }
 return FALSE;
 }
 
-boolean makeDownloadsLink(struct trackDb *tdb)
+boolean makeDownloadsLink(char *database, struct trackDb *tdb)
 // Make a downloads link (if appropriate and then returns TRUE)
 {
-return makeNamedDownloadsLink(tdb,"Downloads");
+return makeNamedDownloadsLink(database, tdb,"Downloads");
 }
 
 boolean makeSchemaLink(char *db,struct trackDb *tdb,char *label)
 // Make a table schema link (if appropriate and then returns TRUE)
@@ -110,9 +110,9 @@
     {
     if(sameString(mdbVar->var,"fileName"))
         {
         printf("<tr onmouseover=\"this.style.cursor='text';\"><td align=right><i>%s:</i></td><td nowrap>",mdbVar->var);
-        makeNamedDownloadsLink(trackDbTopLevelSelfOrParent(tdb), mdbVar->val);
+        makeNamedDownloadsLink(db, trackDbTopLevelSelfOrParent(tdb), mdbVar->val);
         printf("</td></tr>");
         }
     else
         {
@@ -152,9 +152,9 @@
     }
 if(downloadLink)
     {
     struct trackDb *trueTdb = trackDbTopLevelSelfOrParent(tdb);
-    makeNamedDownloadsLink(trueTdb,(moreThanOne ? "downloads":"Downloads"));
+    makeNamedDownloadsLink(db, trueTdb,(moreThanOne ? "downloads":"Downloads"));
     if(metadataLink)
         printf(",");
     }
 if (metadataLink)