src/hg/hgTracks/hgTracks.c 1.1636

Index: src/hg/hgTracks/hgTracks.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/hgTracks.c,v
retrieving revision 1.1635
retrieving revision 1.1636
diff -b -B -U 4 -r1.1635 -r1.1636
--- src/hg/hgTracks/hgTracks.c	18 Mar 2010 00:51:26 -0000	1.1635
+++ src/hg/hgTracks/hgTracks.c	2 Apr 2010 20:14:15 -0000	1.1636
@@ -3504,22 +3504,27 @@
     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 (isUnknownChrom(database, chromName))
+    if (sameWord(database,"oryCun2") || 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"))
+	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 ctgPos where chrom = '%s' and chromStart<%u and chromEnd>%u",
-	    chromName, winEnd, winStart);
+    "select * from %s where chrom = '%s' and chromStart<%u and chromEnd>%u",
+	    ctgPos, chromName, winEnd, winStart);
 	    sr = sqlGetResult(conn, query);
 
 	    int itemCount = 0;
 	    struct ctgPos *ctgItem = NULL;