src/hg/qaPushQ/qaPushQ.c 1.119

Index: src/hg/qaPushQ/qaPushQ.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/qaPushQ/qaPushQ.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -b -B -U 4 -r1.118 -r1.119
--- src/hg/qaPushQ/qaPushQ.c	22 Jan 2010 09:09:23 -0000	1.118
+++ src/hg/qaPushQ/qaPushQ.c	27 Jan 2010 01:35:32 -0000	1.119
@@ -2456,8 +2456,27 @@
 freez(&temp);
 }
 
 
+void mySprintWithGreekByte(char *s, int slength, long long size)
+/* Numbers formatted with PB, TB, GB, MB, KB, B */
+{
+char *greek[] = {"B", "KB", "MB", "GB", "TB", "PB"};
+int i = 0;
+long long d = 1;
+while ((size/d) >= 1024)
+    {
+    ++i;
+    d *= 1024;
+    }
+double result = ((double)size)/d;
+if (result < 10)
+    safef(s,slength,"%3.1f %s",((double)size)/d, greek[i]);
+else
+    safef(s,slength,"%3.0f %s",((double)size)/d, greek[i]);
+}
+
+
 
 long long pq_getTableSize(char *rhost, char *db, char *tbl, int *errCount)  /* added extension pq_ to supress name conflict in hdb.c */
 /* Get table size via show table status command. Return -1 if err. Will match multiple if "%" used in tbl */ 
 {
@@ -2658,12 +2677,12 @@
 printf("<a href=\"%s/cgi-bin/qaPushQ?action=edit&qid=%s&cb=%s\">RETURN</a> \n",crossUrl,newQid,newRandState);
 printf(" <br>\n");
 printf("Location: %s <br>\n",q->currLoc);
 printf("Database: %s <br>\n",q->dbs    );
-printf("  Tables: %s <br>\n",q->tbls   );
-printf("    CGIs: %s <br>\n",q->cgis   );
-printf("   Files: %s <br>\n",q->files  );
-printf(" <br>\n");
+/* deemed too verbose: */
+//printf("  Tables: %s <br>\n",q->tbls   );
+//printf("    CGIs: %s <br>\n",q->cgis   );
+//printf("   Files: %s <br>\n",q->files  );
 
 cutParens(q->dbs);
 cutParens(q->tbls);
 cutParens(q->cgis);
@@ -2952,28 +2971,36 @@
 if (totalTable > 0)
     {
     printf(" <br>\n");
     mySprintWithCommas(nicenumber, sizeof(nicenumber), totalTable);
-    printf(" Total size of tables: %s <br>\n",nicenumber);
+    printf(" Total size of tables: %s ",nicenumber);
+    mySprintWithGreekByte(nicenumber, sizeof(nicenumber), totalTable);
+    printf("&nbsp; ( %s ) <br>\n",nicenumber);
     }
 
 if (totalGbdb > 0)
     {
     printf(" <br>\n");
     mySprintWithCommas(nicenumber, sizeof(nicenumber), totalGbdb);
-    printf(" Total size of /gbdb/ files: %s <br>\n",nicenumber);
+    printf(" Total size of /gbdb/ files: %s ",nicenumber);
+    mySprintWithGreekByte(nicenumber, sizeof(nicenumber), totalGbdb);
+    printf("&nbsp; ( %s ) <br>\n",nicenumber);
     }
 
 if (totalGoldenPath > 0)
     {
     printf(" <br>\n");
     mySprintWithCommas(nicenumber, sizeof(nicenumber), totalGoldenPath);
-    printf(" Total size of .../goldenPath/ files: %s <br>\n",nicenumber);
+    printf(" Total size of .../goldenPath/ files: %s ",nicenumber);
+    mySprintWithGreekByte(nicenumber, sizeof(nicenumber), totalGoldenPath);
+    printf("&nbsp; ( %s ) <br>\n",nicenumber);
     }
 
 printf(" <br>\n");
 mySprintWithCommas(nicenumber, sizeof(nicenumber), totalsize);
-printf(" Total size of all: %s <br>\n",nicenumber);
+printf(" Total size of all: %s ",nicenumber);
+mySprintWithGreekByte(nicenumber, sizeof(nicenumber), totalsize);
+printf("&nbsp; ( %s ) <br>\n",nicenumber);
 
 
 printf(" <br>\n");
 sizeMB = (((totalsize * 1.0) / (1024 * 1024)) + 0.5);