d3adaef1ea5fabff4fada10d63172132a2a5d3f9
larrym
Thu Aug 25 13:34:22 2011 -0700
add id's to external links so we can fix-up the coordinates when doing in-place update
diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c
index 9cc3b40..f3051a8 100644
--- src/hg/hgTracks/hgTracks.c
+++ src/hg/hgTracks/hgTracks.c
@@ -2636,31 +2636,31 @@
name = fixupName;
}
}
else if (sameWord(scientificName, "Saccharomyces cerevisiae"))
{
if (stringIn("2micron", chrName))
{
char *fixupName = replaceChars(chrName, "2micron", "2-micron");
name = fixupName;
}
}
if (sameWord(chrName, "chrM"))
name = "chrMt";
ensUrl = ensContigViewUrl(database, dir, name, seqBaseCount, start+1, end, archive);
-hPrintf("", ensUrl->string);
+hPrintf("", ensUrl->string);
/* NOTE: you can not freeMem(dir) because sometimes it is a literal
* constant */
freeMem(scientificName);
dyStringFree(&ensUrl);
}
void makeHgGenomeTrackVisible(struct track *track)
/* This turns on a track clicked from hgGenome, even if it was previously */
/* hidden manually and there are cart vars to support that. */
{
struct hashEl *hels;
struct hashEl *hel;
char prefix[SMALLBUF];
/* First check if the click was from hgGenome. If not, leave. */
/* get the names of the tracks in the cart */
@@ -3682,124 +3682,124 @@
else
{
hPrintf("| ");
printEnsemblAnchor(database, archive, chromName, winStart, winEnd);
hPrintf("%s | ", "Ensembl");
}
}
}
}
if (!psOutput)
{
/* Print NCBI MapView anchor */
if (sameString(database, "hg18"))
{
- hPrintf(" ",
+ hPrintf(" | ",
skipChr(chromName), winStart+1, winEnd);
hPrintf("%s | ", "NCBI");
}
if (sameString(database, "hg19"))
{
- hPrintf(" ",
+ hPrintf(" | ",
skipChr(chromName), winStart+1, winEnd);
hPrintf("%s | ", "NCBI");
}
if (sameString(database, "mm8"))
{
hPrintf("");
- hPrintf("",
+ hPrintf("",
skipChr(chromName), winStart+1, winEnd);
hPrintf("%s | ", "NCBI");
}
if (sameString(database, "danRer2"))
{
hPrintf("");
- hPrintf("",
+ hPrintf("",
skipChr(chromName), winStart+1, winEnd);
hPrintf("%s | ", "NCBI");
}
if (sameString(database, "galGal3"))
{
hPrintf("");
- hPrintf("",
+ hPrintf("",
skipChr(chromName), winStart+1, winEnd);
hPrintf("%s | ", "NCBI");
}
if (sameString(database, "canFam2"))
{
hPrintf("");
- hPrintf("",
+ hPrintf("",
skipChr(chromName), winStart+1, winEnd);
hPrintf("%s | ", "NCBI");
}
if (sameString(database, "rheMac2"))
{
hPrintf("");
- hPrintf("",
+ hPrintf("",
skipChr(chromName), winStart+1, winEnd);
hPrintf("%s | ", "NCBI");
}
if (sameString(database, "panTro2"))
{
hPrintf("");
- hPrintf("",
+ hPrintf("",
skipChr(chromName), winStart+1, winEnd);
hPrintf("%s | ", "NCBI");
}
if (sameString(database, "anoGam1"))
{
hPrintf("");
- hPrintf("",
+ hPrintf("",
skipChr(chromName), winStart+1, winEnd);
hPrintf("%s | ", "NCBI");
}
if (sameString(database, "bosTau6"))
{
hPrintf("");
- hPrintf("",
+ hPrintf("",
skipChr(chromName), winStart+1, winEnd);
hPrintf("%s | ", "NCBI");
}
if (startsWith("oryLat", database))
{
- hPrintf(" %s | ",
+ hPrintf(" %s | ",
skipChr(chromName), winStart+1, winEnd, "UTGB");
}
if (sameString(database, "cb3"))
{
- hPrintf(" %s | ",
+ hPrintf(" %s | ",
skipChr(chromName), winStart+1, winEnd, "WormBase");
}
if (sameString(database, "cb4"))
{
- hPrintf(" %s | ",
+ hPrintf(" %s | ",
chromName, winStart+1, winEnd, "WormBase");
}
if (sameString(database, "ce10"))
{
- hPrintf(" %s | ",
+ hPrintf(" %s | ",
skipChr(chromName), winStart+1, winEnd, "WormBase");
}
if (sameString(database, "ce4"))
{
- hPrintf(" %s | ",
+ hPrintf(" %s | ",
skipChr(chromName), winStart+1, winEnd, "WormBase");
}
if (sameString(database, "ce2"))
{
- hPrintf(" %s | ",
+ hPrintf(" %s | ",
skipChr(chromName), winStart+1, winEnd, "WormBase");
}
}
if (!psOutput)
{
hPrintf(" %s | ",cartSessionVarName(),
cartSessionId(cart), "PDF/PS");
}
if (!psOutput)
{
if (wikiLinkEnabled())
{
printf(" |