src/hg/gsid/gsidTable/gsidTable.c 1.49

Index: src/hg/gsid/gsidTable/gsidTable.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/gsid/gsidTable/gsidTable.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -b -B -U 4 -r1.48 -r1.49
--- src/hg/gsid/gsidTable/gsidTable.c	23 Sep 2009 17:04:09 -0000	1.48
+++ src/hg/gsid/gsidTable/gsidTable.c	28 Sep 2009 23:25:24 -0000	1.49
@@ -242,9 +242,8 @@
 		if (sameWord(col->type, "integer"))
 		/* special processing for missing data */
 		if (sameWord(col->name, "SDayLastPTest") 	||
     		    sameWord(col->name, "SDayLastTrTest") 	||
-    		    sameWord(col->name, "LastTrVisit")		||
     		    sameWord(col->name, "LastPMNNeutral")	||
     		    sameWord(col->name, "artDaei")		||
     		    sameWord(col->name, "seqDay")		||
     		    sameWord(col->name, "firstRNAPosDay")	||
@@ -703,13 +702,13 @@
 /* Compare to sort rows based on double value. */
 {
 const struct subjInfo *a = *((struct subjInfo **)va);
 const struct subjInfo *b = *((struct subjInfo **)vb);
-return a->sortDouble - b->sortDouble;
+if (a->sortDouble < b->sortDouble)  return 1;
+if (a->sortDouble == b->sortDouble) return 0;
+return -1;
 }
 
-
-
 static char *keyFileName(struct column *col)
 /* Return key file name for this column.  Return
  * NULL if no key file. */
 {
@@ -999,9 +998,8 @@
 hPrintf("<TD align=right>");
 /* special processing for missing data */
 if (sameWord(col->name, "SDayLastPTest") 	||
     sameWord(col->name, "SDayLastTrTest") 	||
-    sameWord(col->name, "LastTrVisit")		||
     sameWord(col->name, "LastPMNNeutral")	||
     sameWord(col->name, "artDaei")		||
     sameWord(col->name, "seqDay")		||
     sameWord(col->name, "firstRNAPosDay")	||
@@ -1090,10 +1088,9 @@
     safef(buf,sizeof(buf),"%s", s);
 else
     {
     if (sameWord(col->name, "LastPVisit") 	||
-	sameWord(col->name, "LastPAntiGP120")	||
-	sameWord(col->name, "LastPCD4Blk"))
+	sameWord(col->name, "LastTrVisit"))
 	{
     	if (sameWord(s, "-1"))
 	   {
     	   safef(buf,sizeof(buf),"N/A");
@@ -1101,9 +1098,9 @@
     	else if (sameWord(s, "-2"))
 	   {
     	   safef(buf,sizeof(buf),"N/D");
 	   }
-    	else if (sameWord(s, "-3"))
+    	else if (sameWord(s, "-3.000")||sameWord(s, "-3.0")||sameWord(s, "-3"))
 	   {
     	   safef(buf,sizeof(buf),"&nbsp");
 	   }
 	else
@@ -1111,11 +1108,14 @@
     	    safef(buf,sizeof(buf),"%.1f",sqlDouble(s));
 	    }
 	}
     else
-    if (sameWord(col->name, "LastTrCD4Blk") || sameWord(col->name, "LastTrAntiGP120"))
+    if (sameWord(col->name, "LastTrCD4Blk")   ||
+        sameWord(col->name, "LastPCD4Blk")    ||
+        sameWord(col->name, "LastPAntiGP120") ||	
+        sameWord(col->name, "LastTrAntiGP120"))
     	{
-    	if (sameWord(s, "-3"))
+    	if (sameWord(s, "-3.000"))
 	   {
     	   safef(buf,sizeof(buf),"&nbsp");
 	   }
     	else if (sameWord(s, "-2"))