src/hg/qaPushQ/qaPushQ.c 1.123

Index: src/hg/qaPushQ/qaPushQ.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/qaPushQ/qaPushQ.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -b -B -U 4 -r1.122 -r1.123
--- src/hg/qaPushQ/qaPushQ.c	27 Feb 2010 00:39:58 -0000	1.122
+++ src/hg/qaPushQ/qaPushQ.c	27 Feb 2010 00:57:47 -0000	1.123
@@ -2613,8 +2613,11 @@
 int errCount = 0;
 off_t totalTable = 0;
 off_t totalGbdb = 0;
 off_t totalGoldenPath = 0;
+int tableCount = 0;
+int gbdbCount = 0;
+int goldenCount = 0;
 int i = 0, ii = 0, iii = 0;
 int j = 0, jj = 0, jjj = 0;
 int g = 0, gg = 0, ggg = 0;
 char nicenumber[1024]="";
@@ -2763,8 +2766,9 @@
 			safef(tbl,sizeof(tbl),"%s",tempVal);
 			long long tableSize = pq_getTableSize(q->currLoc,db,tbl,&errCount);
 			totalsize += tableSize;
 			totalTable += tableSize;
+			++tableCount;
 			}
 		    }
 		}
 
@@ -2891,11 +2895,17 @@
 			totalsize+=size;
 			sprintLongWithCommas(nicenumber, size);
 			printf("<tr><td>%s<td/><td>%s</td></tr>\n",gVal,nicenumber);
 			if (startsWith("/gbdb/", pathName))
+			    {
 			    totalGbdb+=size;
+			    ++gbdbCount;
+			    }
 			if (stringIn("/goldenPath/", pathName))
+			    {
     			    totalGoldenPath+=size;
+			    ++goldenCount;
+			    }
 			}
 		    }
 		else
 		    { /* wildcards found in name, use listDirX */
@@ -2933,11 +2943,17 @@
 			else
 			    {
     			    totalsize+=fi->size;
 			    if (startsWith("/gbdb/", filePath))
+				{
+				++gbdbCount;
 				totalGbdb+=fi->size;
+				}
     			    if (stringIn("/goldenPath/", filePath))
+				{
+				++goldenCount;
 				totalGoldenPath+=fi->size;
+				}
     			    sprintLongWithCommas(nicenumber, fi->size);
     			    printf("<tr><td>%s<td/><td>%s</td></tr>\n",fi->name,nicenumber);
 			    }
 			}
@@ -2955,27 +2971,33 @@
     printf(" <br>\n");
     mySprintWithCommas(nicenumber, sizeof(nicenumber), totalTable);
     printf(" Total size of tables: %s ",nicenumber);
     sprintWithGreekByte(nicenumber, sizeof(nicenumber), totalTable);
-    printf("&nbsp; ( %s ) <br>\n",nicenumber);
+    printf("&nbsp; ( %s ) ",nicenumber);
+    mySprintWithCommas(nicenumber, sizeof(nicenumber), tableCount);
+    printf("&nbsp; ( %s tables ) <br>\n", nicenumber);
     }
 
 if (totalGbdb > 0)
     {
     printf(" <br>\n");
     mySprintWithCommas(nicenumber, sizeof(nicenumber), totalGbdb);
     printf(" Total size of /gbdb/ files: %s ",nicenumber);
     sprintWithGreekByte(nicenumber, sizeof(nicenumber), totalGbdb);
-    printf("&nbsp; ( %s ) <br>\n",nicenumber);
+    printf("&nbsp; ( %s ) ",nicenumber);
+    mySprintWithCommas(nicenumber, sizeof(nicenumber), gbdbCount);
+    printf("&nbsp; ( %s gbdb files ) <br>\n", nicenumber);
     }
 
 if (totalGoldenPath > 0)
     {
     printf(" <br>\n");
     mySprintWithCommas(nicenumber, sizeof(nicenumber), totalGoldenPath);
     printf(" Total size of .../goldenPath/ files: %s ",nicenumber);
     sprintWithGreekByte(nicenumber, sizeof(nicenumber), totalGoldenPath);
-    printf("&nbsp; ( %s ) <br>\n",nicenumber);
+    printf("&nbsp; ( %s ) ",nicenumber);
+    mySprintWithCommas(nicenumber, sizeof(nicenumber), goldenCount);
+    printf("&nbsp; ( %s goldenPath files ) <br>\n", nicenumber);
     }
 
 printf(" <br>\n");
 mySprintWithCommas(nicenumber, sizeof(nicenumber), totalsize);