src/hg/hgGene/microarray.c 1.16

1.16 2009/09/25 18:26:16 aamp
Fixed the problem with the missing Affy Exon data from known genes. The problem stems from the removal of the requirement to have a lookup table in the Gene Sorter. In this case, that table would have been called "knownToKnown" but is simply "null" in the columnDb.ra

Index: src/hg/hgGene/microarray.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgGene/microarray.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -b -B -U 4 -r1.15 -r1.16
--- src/hg/hgGene/microarray.c	31 Jan 2009 07:45:33 -0000	1.15
+++ src/hg/hgGene/microarray.c	25 Sep 2009 18:26:16 -0000	1.16
@@ -97,12 +97,15 @@
 char *exp = nextWord(&parameters);
 char *probe = NULL;
 if (exp == NULL)
     errAbort("short expRatio type line");
-if (!sqlTableExists(conn, lookup) 
+if ((!sameWord(lookup, "null") && !sqlTableExists(conn, lookup))
 	|| !sqlTableExists(conn, data) || !sqlTableExists(conn, exp))
     return NULL;
-probe = expProbe(conn, lookup, geneId);
+if (sameWord(lookup, "null"))
+    probe = geneId;
+else 
+    probe = expProbe(conn, lookup, geneId);
 return checkProbeData(conn, data, probe);
 }
 
 static void expMultiSubtype(struct hash *ra, char *colName,