src/hg/lib/hgExp.c 1.18

1.18 2009/03/03 23:29:06 aamp
Changed the expRatio column type so that it doesn't need to have a knownTo* table, rather a "null" indicates that the microarray table uses knownGene identifiers.
Index: src/hg/lib/hgExp.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/hgExp.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -b -B -U 4 -r1.17 -r1.18
--- src/hg/lib/hgExp.c	31 Jan 2009 07:28:55 -0000	1.17
+++ src/hg/lib/hgExp.c	3 Mar 2009 23:29:06 -0000	1.18
@@ -143,14 +143,20 @@
 char expName[64];
 struct sqlResult *sr;
 char **row;
 boolean ok = FALSE;
-safef(query, sizeof(query), "select value from %s where name = '%s'", 
+if (!sameWord(lookupTable, "null"))
+    {
+    safef(query, sizeof(query), "select value from %s where name = '%s'", 
 	lookupTable, name);
-if (sqlQuickQuery(lookupConn, query, expName, sizeof(expName)) == NULL)
+    if (sqlQuickQuery(lookupConn, query, expName, sizeof(expName)) == NULL)
     return FALSE;
-safef(query, sizeof(query), "select expScores from %s where name = '%s'",
+    safef(query, sizeof(query), "select expScores from %s where name = '%s'",
 	dataTable, expName);
+    }
+else
+    safef(query, sizeof(query), "select expScores from %s where name = '%s'",
+	  dataTable, name);    
 sr = sqlGetResult(dataConn, query);
 if ((row = sqlNextRow(sr)) != NULL)
     {
     sqlFloatDynamicArray(row[0], retVals, retValCount);