29627781f1a5b60b30ec2cf8ad7295ba50e03742
hiram
  Thu Apr 21 14:21:05 2011 -0700
oryCun2 now has a proper ucscToEnsembl translation table
diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c
index 74cb8d7..fa82cff 100644
--- src/hg/hgTracks/hgTracks.c
+++ src/hg/hgTracks/hgTracks.c
@@ -3555,48 +3555,46 @@
         {
         /* Print Ensembl anchor for latest assembly of organisms we have
         * supported by Ensembl == if versionString from trackVersion exists */
         if (sameWord(database,"hg19"))
             {
             hPrintf("<TD ALIGN=CENTER>&nbsp;&nbsp;");
             printEnsemblAnchor(database, NULL, chromName, winStart, winEnd);
             hPrintf("%s</A>&nbsp;&nbsp;</TD>", "Ensembl");
             }
         else if (sameWord(database,"hg18"))
             {
             hPrintf("<TD ALIGN=CENTER>&nbsp;&nbsp;");
             printEnsemblAnchor(database, "ncbi36", chromName, winStart, winEnd);
             hPrintf("%s</A>&nbsp;&nbsp;</TD>", "Ensembl");
             }
-        else if (sameWord(database,"anoCar2") || sameWord(database,"calJac3"))
+        else if (sameWord(database,"oryCun2") || sameWord(database,"anoCar2") || sameWord(database,"calJac3"))
             {
             hPrintf("<TD ALIGN=CENTER>&nbsp;&nbsp;");
             printEnsemblAnchor(database, NULL, chromName, winStart, winEnd);
             hPrintf("%s</A>&nbsp;&nbsp;</TD>", "Ensembl");
             }
         else if (ensVersionString[0])
             {
             char *archive = NULL;
             if (ensDateReference[0] && differentWord("current", ensDateReference))
                 archive = cloneString(ensDateReference);
             /*  Can we perhaps map from a UCSC random chrom to an Ensembl contig ? */
-            if (sameWord(database,"oryCun2") || isUnknownChrom(database, chromName))
+            if (isUnknownChrom(database, chromName))
                 {
                 //	which table to check
                 char *ctgPos = "ctgPos";
-                if (sameWord(database,"oryCun2"))
-                    ctgPos = "ctgPos2";
 
                 if (sameWord(database,"fr2"))
                     fr2ScaffoldEnsemblLink(archive);
                 else if (hTableExists(database, ctgPos))
                     /* see if we are entirely within a single contig */
                     {
                     struct sqlConnection *conn = hAllocConn(database);
                     struct sqlResult *sr = NULL;
                     char **row = NULL;
                     char query[256];
                     safef(query, sizeof(query),
             "select * from %s where chrom = '%s' and chromStart<%u and chromEnd>%u",
                     ctgPos, chromName, winEnd, winStart);
                     sr = sqlGetResult(conn, query);