9a8ea2436c7a0e498c0e903c6257e808a0ccd0ee hiram Fri Jul 6 21:04:48 2018 -0700 use long long to display total genome size over 4Gb refs #21715 diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index 3865650..60852b7 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -9565,48 +9565,47 @@ else { safef(msg1, sizeof(msg1), "Limit reached"); safef(msg2, sizeof(msg2), "%d rows displayed", limit); cgiSimpleTableRowStart(); cgiSimpleTableFieldStart(); puts(msg1); cgiTableFieldEnd(); cgiSimpleTableFieldStart(); puts(msg2); cgiTableFieldEnd(); for(;limit-- && (chromInfo != NULL); chromInfo = chromInfo->next) total += chromInfo->size; unsigned scafCount = seqCount; - unsigned totalSize = total; cgiTableRowEnd(); safef(msg1, sizeof(msg1), "contig/scaffold
count:"); safef(msg2, sizeof(msg2), "total size:"); cgiSimpleTableRowStart(); cgiSimpleTableFieldStart(); puts(msg1); cgiTableFieldEnd(); cgiSimpleTableFieldStart(); puts(msg2); cgiTableFieldEnd(); cgiTableRowEnd(); cgiSimpleTableRowStart(); cgiSimpleTableFieldStart(); printLongWithCommas(stdout, scafCount); cgiTableFieldEnd(); cgiSimpleTableFieldStart(); - printLongWithCommas(stdout, totalSize); + printLongWithCommas(stdout, total); cgiTableFieldEnd(); cgiTableRowEnd(); } } void chromInfoRowsNonChrom(int limit) /* Make table rows of non-chromosomal chromInfo name & size, sorted by size. */ { if (trackHubDatabase(database)) { chromInfoRowsNonChromTrackHub(limit); return; } struct sqlConnection *conn = hAllocConn(database); @@ -9657,31 +9656,31 @@ safef(msg1, sizeof(msg1), "Limit reached"); safef(msg2, sizeof(msg2), "%d rows displayed", limit); cgiSimpleTableRowStart(); cgiSimpleTableFieldStart(); puts(msg1); cgiTableFieldEnd(); cgiSimpleTableFieldStart(); puts(msg2); cgiTableFieldEnd(); sqlFreeResult(&sr); sqlSafef(query, sizeof(query), "select count(*),sum(size) from chromInfo"); sr = sqlGetResult(conn, query); if ((row = sqlNextRow(sr)) != NULL) { unsigned scafCount = sqlUnsigned(row[0]); - unsigned totalSize = sqlUnsigned(row[1]); + long long totalSize = sqlLongLong(row[1]); cgiTableRowEnd(); safef(msg1, sizeof(msg1), "contig/scaffold
count:"); safef(msg2, sizeof(msg2), "total size:"); cgiSimpleTableRowStart(); cgiSimpleTableFieldStart(); puts(msg1); cgiTableFieldEnd(); cgiSimpleTableFieldStart(); puts(msg2); cgiTableFieldEnd(); cgiTableRowEnd(); cgiSimpleTableRowStart(); cgiSimpleTableFieldStart(); printLongWithCommas(stdout, scafCount); cgiTableFieldEnd();