src/hg/lib/trackDbCustom.c 1.79

1.79 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/lib/trackDbCustom.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/trackDbCustom.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -b -B -U 4 -r1.78 -r1.79
--- src/hg/lib/trackDbCustom.c	6 Feb 2010 21:43:02 -0000	1.78
+++ src/hg/lib/trackDbCustom.c	9 Feb 2010 23:27:21 -0000	1.79
@@ -615,10 +615,17 @@
 if (origAssembly)
     {
     if (differentString(origAssembly, database))
         {
+	printf("<B>Data coordinates converted via <A TARGET=_BLANK "
+	       "HREF=\"../goldenPath/help/hgTracksHelp.html#Liftover\">liftOver</A> from:</B> ");
         char *freeze = hFreezeFromDb(origAssembly);
-        printf("<B>Data coordinates converted via <A TARGET=_BLANK HREF=\"../goldenPath/help/hgTracksHelp.html#Liftover\">liftOver</A> from:</B> %s %s%s%s<BR>\n", freeze ? freeze : "", freeze ? "(" : "", origAssembly, freeze ? ")":"");
+	if (freeze == NULL)
+	    printf("%s<BR>\n", origAssembly);
+	else if (stringIn(origAssembly, freeze))
+	    printf("%s<BR>\n", freeze);
+	else
+	    printf("%s (%s)<BR>\n", freeze, origAssembly);
         }
     }
 }