src/hg/hgTables/rangeHistogram.c 1.5

Index: src/hg/hgTables/rangeHistogram.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTables/rangeHistogram.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -B -U 1000000 -r1.4 -r1.5
--- src/hg/hgTables/rangeHistogram.c	29 May 2008 17:32:18 -0000	1.4
+++ src/hg/hgTables/rangeHistogram.c	10 Apr 2009 20:04:29 -0000	1.5
@@ -1,105 +1,105 @@
 /* ranges - display value ranges and histograms on fields. */
 
 #include "common.h"
 #include "linefile.h"
 #include "hash.h"
 #include "htmshell.h"
 #include "cheapcgi.h"
 #include "cart.h"
 #include "jksql.h"
 #include "hgTables.h"
 #include "bedCart.h"
 
 static char const rcsid[] = "$Id$";
 
 static void printValueHistogram(char *db, char *table, char *field)
 /* Print very simple-minded text histogram. */
 {
 double maxHist = 60;
 double scale = -1.0;
 struct sqlConnection *conn = sqlConnect(db);
 struct sqlResult *sr;
 char **row;
 char query[256];
 
 safef(query, sizeof(query),
    "select %s, count(*) as count from %s group by %s order by count desc",
    field, table, field);
 sr = sqlGetResult(conn, query);
 hTableStart();
 hPrintf("<TR>");
 hPrintf("<TH>value</TH>");
 hPrintf("<TH>count</TH>");
 hPrintf("<TH>graph</TH>");
 hPrintf("</TR>");
 while ((row = sqlNextRow(sr)) != NULL)
     {
     char *name = htmlEncode(row[0]);
     int count = atoi(row[1]);
     int starCount;
     if (scale < 0)
 	scale = (maxHist)/count;
     hPrintf("<TR><TD>%s</TD>", name);
     hPrintf("<TD ALIGN=RIGHT>%d</TD>", count);
     hPrintf("<TD>");
     starCount = round(scale*count);
     if (starCount > 0)
 	starOut(stdout, starCount);
     else
         hPrintf("&nbsp;");
     hPrintf("</TD></TR>\n");
     freeMem(name);
     }
 // hPrintf("</TABLE>");
 hTableEnd();
 sqlDisconnect(&conn);
 }
 
 void doValueHistogram(char *field)
 /* Put up value histogram. */
 {
 char *db = cartString(cart, hgtaDatabase);
 char *table = cartString(cart, hgtaHistoTable);
 htmlOpen("Value histogram for %s.%s.%s", db, table, field);
 printValueHistogram(db, table, field);
 htmlClose();
 }
 
 static void printValueRange(char *db, char *table, char *field)
 /* Print min/max/mean. */
 {
 struct sqlConnection *conn = sqlConnect(db);
 struct sqlResult *sr;
 char **row;
 char query[256];
 
 safef(query, sizeof(query),
    "select min(%s), max(%s), avg(%s) from %s", field, field, field, table);
 sr = sqlGetResult(conn, query);
 while ((row = sqlNextRow(sr)) != NULL)
     {
     hPrintf("<B>min:</B> %s <B>max:</B> %s <B>average:</B> %s\n",
     	row[0], row[1], row[2]);
     }
 sqlDisconnect(&conn);
 }
 
 
 void doValueRange(char *field)
 /* Put up value histogram. */
 {
 char *db = cartString(cart, hgtaDatabase);
 char *table = cartString(cart, hgtaHistoTable);
 boolean showItemRgb = FALSE;
 
-showItemRgb=bedItemRgb(curTrack);	/* should we expect itemRgb */
-					/*	instead of "reserved" */
+showItemRgb=bedItemRgb(findTdbForTable(db, curTrack, table));
+// should we expect itemRgb instead of "reserved"
 
 if (showItemRgb && sameWord(field, "reserved"))
     htmlOpen("Value range for %s.%s.itemRgb", db, table);
 else
     htmlOpen("Value range for %s.%s.%s", db, table, field);
 printValueRange(db, table, field);
 htmlClose();
 }