src/hg/hgTracks/hgTracks.c 1.1623
1.1623 2010/02/09 23:27:21 angie
If the result of 'hFreezeName' (dbDb.description) contains the database name, as I intend to make happen, don't also show the database name in parens.
Index: src/hg/hgTracks/hgTracks.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/hgTracks.c,v
retrieving revision 1.1622
retrieving revision 1.1623
diff -b -B -U 4 -r1.1622 -r1.1623
--- src/hg/hgTracks/hgTracks.c 9 Feb 2010 00:11:34 -0000 1.1622
+++ src/hg/hgTracks/hgTracks.c 9 Feb 2010 23:27:21 -0000 1.1623
@@ -4324,8 +4324,12 @@
organization, browserName, freezeName);
}
else
{
+ if (stringIn(database, freezeName))
+ hPrintf("%s %s on %s %s Assembly",
+ organization, browserName, organism, freezeName);
+ else
hPrintf("%s %s on %s %s Assembly (%s)",
organization, browserName, organism, freezeName, database);
}
}
@@ -5245,11 +5249,16 @@
/* Show list of chromosomes (or scaffolds, etc) on which this db is based. */
{
char *position = cartUsualString(cart, "position", hDefaultPos(database));
char *defaultChrom = hDefaultChrom(database);
+char *freeze = hFreezeFromDb(database);
struct dyString *title = dyStringNew(512);
-dyStringPrintf(title, "%s %s (%s) Browser Sequences",
- hOrganism(database), hFreezeFromDb(database), database);
+if (stringIn(database, freeze))
+ dyStringPrintf(title, "%s %s Browser Sequences",
+ hOrganism(database), freeze);
+else
+ dyStringPrintf(title, "%s %s (%s) Browser Sequences",
+ hOrganism(database), freeze, database);
webStartWrapperDetailedNoArgs(cart, database, "", title->string, FALSE, FALSE, FALSE, FALSE);
printf("<FORM ACTION=\"%s\" NAME=\"posForm\" METHOD=GET>\n", hgTracksName());
cartSaveSession(cart);