src/hg/hgTracks/hgTracks.c 1.1554

1.1554 2009/02/11 00:49:43 hiram
Straighten out business with fr2ScaffoldEnsemblLink()
Index: src/hg/hgTracks/hgTracks.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/hgTracks.c,v
retrieving revision 1.1553
retrieving revision 1.1554
diff -b -B -U 4 -r1.1553 -r1.1554
--- src/hg/hgTracks/hgTracks.c	10 Feb 2009 22:16:52 -0000	1.1553
+++ src/hg/hgTracks/hgTracks.c	11 Feb 2009 00:49:43 -0000	1.1554
@@ -2853,8 +2853,9 @@
 	hTableExists("hgFixed", "rebaseCompanies"));
 }
 
 void fr2ScaffoldEnsemblLink(char *archive)
+/* print out Ensembl link to appropriate scaffold there */
 {
     struct sqlConnection *conn = hAllocConn(database);
     struct sqlResult *sr = NULL;
     char **row = NULL;
@@ -2987,10 +2988,10 @@
     if (isUnknownChrom(database, chromName))
 	{
 	if (sameWord(database,"fr2"))
 	    fr2ScaffoldEnsemblLink(archive);
+	else if (hTableExists(database, "ctgPos"))
 	/* see if we are entirely within a single contig */
-	if (hTableExists(database, "ctgPos"))
 	    {
 	    struct sqlConnection *conn = hAllocConn(database);
 	    struct sqlResult *sr = NULL;
 	    char **row = NULL;