e0db353cfefb9bde9cce31d6a2c2d2762dc1de4a
kate
  Wed Sep 12 17:19:14 2018 -0700
IMplement fieldName> expansion in trackDb url setting. refs #22078

diff --git src/hg/hgc/lrgClick.c src/hg/hgc/lrgClick.c
index 23fed27..149d081 100644
--- src/hg/hgc/lrgClick.c
+++ src/hg/hgc/lrgClick.c
@@ -92,43 +92,43 @@
 	errAbort("doLrg: inconsistent fieldCount (bbi has %d, row has %d)",
 		 fieldCount, bbFieldCount);
     struct lrg *lrg = lrgLoad(fields);
     if (differentString(lrg->name, item))
 	continue;
     found = TRUE;
     printCustomUrl(tdb, lrg->name, TRUE);
     bedPrintPos((struct bed *)lrg, bedSize, tdb);
     char *url = hashFindVal(columnUrls, "hgncId");
     printf("<B>HGNC Gene Symbol:</B> ");
     if (isNotEmpty(url))
 	{
 	char hgncIdStr[32];
 	safef(hgncIdStr, sizeof(hgncIdStr), "%d", lrg->hgncId);
         char *idUrl = replaceInUrl(url, hgncIdStr, cart, database, seqName, winStart, 
-                    winEnd, tdb->track, TRUE);
+                    winEnd, tdb->track, TRUE, NULL);
 	printf("<A HREF='%s' TARGET=_BLANK>%s</A><BR>\n", idUrl, lrg->hgncSymbol);
 	}
     else
 	printf("%s<BR>\n", lrg->hgncSymbol);
     printf("<B>Source of LRG sequence:</B> "
 	   "<A HREF='%s' TARGET=_BLANK>%s</A><BR>\n", lrg->lrgSourceUrl, lrg->lrgSource);
     printf("<B>LRG Sequence at NCBI:</B> ");
     url = hashFindVal(columnUrls, "ncbiAcc");
     if (isNotEmpty(url))
 	{
         char *idUrl = replaceInUrl(url, lrg->ncbiAcc, cart, database, seqName, winStart, 
-                    winEnd, tdb->track, TRUE);
+                    winEnd, tdb->track, TRUE, NULL);
 	printf("<A HREF='%s' TARGET=_BLANK>%s</A><BR>\n", idUrl, lrg->ncbiAcc);
 	}
     else
 	printf("%s<BR>\n", lrg->ncbiAcc);
     printf("<B>Creation Date:</B> %s<BR>\n", lrg->creationDate);
     char *assemblyDate = hFreezeDate(database);
     if (isNotEmpty(lrg->mismatches))
 	{
 	printf("<BR><B>Mismatches between %s and %s assembly sequence:</B><BR>\n",
 	       lrg->name, assemblyDate);
 	struct lrgDiff *mismatches = lrgParseMismatches(lrg);
 	printLrgDiffs(lrg, mismatches);
 	}
     if (isNotEmpty(lrg->indels))
 	{
@@ -214,31 +214,31 @@
 hFreeConn(&conn);
 
 genericHeader(tdb, item);
 char *url = trackDbSetting(tdb, "url");
 if (isNotEmpty(url))
     {
     char *lrgName = cloneString(item);
     // Truncate the "t1" part to get the LRG ID for link:
     char *p = strchr(lrgName, 't');
     if (p)
 	*p = '\0';
     char *urlLabel = trackDbSettingOrDefault(tdb, "urlLabel", "LRG Transcript link");
     printf("<B>%s</B> ", urlLabel);
     //char *lrgTUrl = replaceInUrl(tdb, url, lrgName, TRUE);
     char *lrgTUrl = replaceInUrl(url, lrgName, cart, database, seqName, winStart, 
-                    winEnd, tdb->track, TRUE);
+                    winEnd, tdb->track, TRUE, NULL);
     printf("<A HREF='%s' TARGET=_BLANK>%s</A><BR>\n", lrgTUrl, item);
     }
 
 struct genePred *gp = genePredFromPsl3(psl, cds, genePredAllFlds, genePredPslCdsMod3, -1, -1);
 printPos(gp->chrom, gp->txStart, gp->txEnd, gp->strand, FALSE, NULL);
 printf("<H3>Links to %s sequence:</H3>\n", item);
 printf("<UL>\n");
 char *pepTable = trackDbSetting(tdb, "pepTable");
 if ((pepTable != NULL) && hGenBankHaveSeq(database, item, pepTable))
     {
     puts("<LI>\n");
     hgcAnchorSomewhere("htcTranslatedProtein", item, pepTable, seqName);
     printf("Translated Protein</A> \n");
     puts("</LI>\n");
     }