src/hg/gsid/gsidTable/gsidTable.c 1.44

Index: src/hg/gsid/gsidTable/gsidTable.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/gsid/gsidTable/gsidTable.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -b -B -U 4 -r1.43 -r1.44
--- src/hg/gsid/gsidTable/gsidTable.c	13 Aug 2009 13:58:15 -0000	1.43
+++ src/hg/gsid/gsidTable/gsidTable.c	14 Aug 2009 18:36:45 -0000	1.44
@@ -921,9 +921,9 @@
 safef(query, sizeof(query), col->query, si->fields[0]);
 answer = sqlQuickString(conn, query);
 if (answer == NULL) 
     {
-    return(cloneString("-1"));
+    return(cloneString("N/A"));
     }
 else 
     {
     return answer;
@@ -954,50 +954,26 @@
 special = FALSE;
 char *s = col->cellVal(col, si, conn);
 hPrintf("<TD align=right>");
 /* special processing for missing data */
-if (sameWord(col->name, "SDayLastPTest"))
+if (sameWord(col->name, "SDayLastPTest") 	||
+    sameWord(col->name, "SDayLastTrTest") 	||
+    sameWord(col->name, "LastTrVisit")		||
+    sameWord(col->name, "LastPMNNeutral")	||
+    sameWord(col->name, "art_Daei")		||
+    sameWord(col->name, "LastTrMnNeutral")	
+   )
     {
     if (sameWord(s, "-1"))
 	{
 	hPrintf("N/A");
 	special = TRUE;
 	}
-    }
-if (sameWord(col->name, "SDayLastTrTest"))
-    {
-    if (sameWord(s, "-1"))
-	{
-	hPrintf("N/A");
-	special = TRUE;
-	}
-    }
-if (sameWord(col->name, "SDayLastTrTest"))
-    {
     if (sameWord(s, "-2"))
 	{
 	hPrintf("N/D");
 	special = TRUE;
 	}
-    }
-if (sameWord(col->name, "LastTrVisit"))
-    {
-    if (sameWord(s, "-1"))
-	{
-	hPrintf("N/A");
-	special = TRUE;
-	}
-    }
-if (sameWord(col->name, "LastTrVisit"))
-    {
-    if (sameWord(s, "-2"))
-	{
-	hPrintf("N/D");
-	special = TRUE;
-	}
-    }
-if (sameWord(col->name, "LastTrMnNeutral"))
-    {
     if (sameWord(s, "-3"))
     	{
     	hPrintf("&nbsp");
 	special = TRUE;
@@ -1067,9 +1043,11 @@
 if (sameString(s,"."))  // known bad data value
     safef(buf,sizeof(buf),"%s", s);
 else
     {
-    if (sameWord(col->name, "LastPVisit") ||sameWord(col->name, "LastPCD4Blk"))
+    if (sameWord(col->name, "LastPVisit") 	||
+	sameWord(col->name, "LastPAntiGP120")	||
+	sameWord(col->name, "LastPCD4Blk"))
     	{
     	if (sameWord(s, "-1"))
 	   {
     	   safef(buf,sizeof(buf),"N/A");