src/hg/gsid/gsidTable/gsidTable.c 1.45

Index: src/hg/gsid/gsidTable/gsidTable.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/gsid/gsidTable/gsidTable.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -b -B -U 4 -r1.44 -r1.45
--- src/hg/gsid/gsidTable/gsidTable.c	14 Aug 2009 18:36:45 -0000	1.44
+++ src/hg/gsid/gsidTable/gsidTable.c	17 Sep 2009 17:09:24 -0000	1.45
@@ -233,9 +233,9 @@
                 first = FALSE;
             else
                 hPrintf("\t");
             if (val == NULL)
-                hPrintf("n/a");
+                hPrintf("N/A");
             else
 		{
 		special = FALSE;
 		if (sameWord(col->name, "cd4Count"))
@@ -538,9 +538,9 @@
 
 static char *noVal(struct column *col, struct subjInfo *si, struct sqlConnection *conn)
 /* Return not-available value. */
 {
-return cloneString("n/a");
+return cloneString("N/A");
 }
 
 static int oneColumn(struct column *col)
 /* Return that we have single column. */
@@ -616,9 +616,9 @@
 boolean isSubjID = sameString(col->name,"subjId");
 hPrintf("<TD>");
 if (s == NULL)
     {
-    hPrintf("n/a");
+    hPrintf("N/A");
     }
 else
     {
     if (isSubjID)
@@ -919,11 +919,11 @@
 char query[256];
 char *answer;
 safef(query, sizeof(query), col->query, si->fields[0]);
 answer = sqlQuickString(conn, query);
-if (answer == NULL) 
+if ((answer == NULL) && sameWord(col->type, "integer"))
     {
-    return(cloneString("N/A"));
+    return(cloneString("-1"));
     }
 else 
     {
     return answer;
@@ -958,9 +958,12 @@
 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, "artDaei")		||
+    sameWord(col->name, "seqDay")		||
+    sameWord(col->name, "firstRNAPosDay")	||
+    sameWord(col->name, "lastSeroNegDay")	||
     sameWord(col->name, "LastTrMnNeutral")	
    )
     {
     if (sameWord(s, "-1"))