src/hg/lib/hgFind.c 1.227

Index: src/hg/lib/hgFind.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/hgFind.c,v
retrieving revision 1.226
retrieving revision 1.227
diff -b -B -U 4 -r1.226 -r1.227
--- src/hg/lib/hgFind.c	1 Apr 2010 03:12:15 -0000	1.226
+++ src/hg/lib/hgFind.c	26 Apr 2010 23:17:41 -0000	1.227
@@ -1708,10 +1708,8 @@
     {
     char *organism = hOrganism(hgp->database);      /* dbDb organism column */
     char title[256];
     slReverse(&table->posList);
-    if (isNewChimp(db))
-        organism = cloneString("Chimp or Human");
     safef(title, sizeof(title), "%s%s %sligned mRNA Search Results",
 			isXeno ? "Non-" : "", organism, 
 			aligns ?  "A" : "Una");
     freeMem(organism);
@@ -2127,24 +2125,11 @@
 		char desc[256];
 		AllocVar(table);
 		table->name = cloneString(hfs->searchTable);
 		if (startsWith("xeno", hfs->searchTable))
-                    {
-                    if (isNewChimp(db))
-                        safef(desc, sizeof(desc), 
-                                "Non-Chimp or Human RefSeq Genes");
-                    else
-                        safef(desc, sizeof(desc), "Non-%s RefSeq Genes",
-                              hOrganism(db));
-                    }
-		else
-                    {
-                    if (isNewChimp(db))
-                        safef(desc, sizeof(desc), 
-                                "Chimp and Human RefSeq Genes");
+                    safef(desc, sizeof(desc), "Non-%s RefSeq Genes", hOrganism(db));
                     else
                         safef(desc, sizeof(desc), "RefSeq Genes");
-                    }
 		table->description = cloneString(desc);
 		slAddHead(&hgp->tableList, table);
 		}
 	    slAddHead(&table->posList, pos);
@@ -2901,31 +2886,8 @@
 		     "^([[:alnum:]._\\-]+)"
 		     "[[:space:]]*:[[:space:]]*"
 		     "([0-9,]+)$";
 
-static boolean chimpSpecialChrom(struct hgPositions *hgp, char **term, 
-                                        char *hgAppName)
-/* special handling for newer chimp assemblies to warn user
- * that chr2 is gone, and set default position */
-{
-char *msg = "No chr2 or chr23 in newer chimp assemblies: see <A TARGET=_BLANK HREF=\"http://genome.ucsc.edu/FAQ/FAQdownloads#download25\">Chimp Chromosome Numbering</A>";
-
-if (isNewChimp(hgp->database))
-    {
-    if (sameString("chr2", *term) || startsWith("chr2:", *term) ||
-        sameString("chr23", *term) || startsWith("chr23:", *term))
-        {
-        *term = hDefaultPos(hgp->database);
-        if (endsWith(hgAppName, "hgTables"))
-            hUserAbort("%s", msg);
-        else
-            warn("%s", msg);
-        return TRUE;
-        }
-    }
-return FALSE;
-}
-
 static void collapseSamePos(struct hgPositions *hgp)
 /* If all positions in all tables in hgp are the same position, then 
  * trim all but the first table/pos. */
 {
@@ -3043,10 +3005,8 @@
 
 if (singleSearch(db, term, cart, hgp))
     return hgp;
 
-chimpSpecialChrom(hgp, &term, hgAppNameIn);
-
 /* Allow any search term to end with a :Start-End range -- also support stuff 
  * pasted in from BED (chrom start end) or SQL query (chrom | start | end).  
  * If found, strip it off and remember the start and end. */
 if ((canonicalSpec =