Fossil SCM
Take advantage of the recently enhancement to the "translate" utility to simplify the logic for the "stat" webpage.
Commit
2008cecf1cd80b09eb95e88a5c07be76507e3f59
Parent
89f37c045863170…
1 file changed
+4
-10
+4
-10
| --- src/stat.c | ||
| +++ src/stat.c | ||
| @@ -112,28 +112,22 @@ | ||
| 112 | 112 | @ </td></tr> |
| 113 | 113 | } |
| 114 | 114 | @ <tr><th>Duration Of Project:</th><td> |
| 115 | 115 | n = db_int(0, "SELECT julianday('now') - (SELECT min(mtime) FROM event)" |
| 116 | 116 | " + 0.99"); |
| 117 | - @ %d(n) days | |
| 118 | - sqlite3_snprintf(sizeof(zBuf), zBuf, "%.2f", n/365.24); | |
| 119 | - @ or approximately %s(zBuf) years | |
| 117 | + @ %d(n) days or approximately %.2f(n/356.24) years. | |
| 120 | 118 | @ </td></tr> |
| 121 | 119 | @ <tr><th>Project ID:</th><td>%h(db_get("project-code",""))</td></tr> |
| 122 | 120 | @ <tr><th>Server ID:</th><td>%h(db_get("server-code",""))</td></tr> |
| 123 | - | |
| 124 | 121 | @ <tr><th>Fossil Version:</th><td> |
| 125 | 122 | @ %h(RELEASE_VERSION) %h(MANIFEST_DATE) %h(MANIFEST_VERSION) |
| 126 | 123 | @ (%h(COMPILER_NAME)) |
| 127 | 124 | @ </td></tr> |
| 128 | - @ <tr><th>SQLite Version:</th><td> | |
| 129 | - sqlite3_snprintf(sizeof(zBuf), zBuf, "%.19s [%.10s] (%s)", | |
| 130 | - SQLITE_SOURCE_ID, &SQLITE_SOURCE_ID[20], SQLITE_VERSION); | |
| 131 | - zDb = db_name("repository"); | |
| 132 | - @ %s(zBuf) | |
| 133 | - @ </td></tr> | |
| 125 | + @ <tr><th>SQLite Version:</th><td>%.19s(SQLITE_SOURCE_ID) | |
| 126 | + @ [%.10s(&SQLITE_SOURCE_ID[20])] (%s(SQLITE_VERSION))</td></tr> | |
| 134 | 127 | @ <tr><th>Database Stats:</th><td> |
| 128 | + zDb = db_name("repository"); | |
| 135 | 129 | @ %d(db_int(0, "PRAGMA %s.page_count", zDb)) pages, |
| 136 | 130 | @ %d(db_int(0, "PRAGMA %s.page_size", zDb)) bytes/page, |
| 137 | 131 | @ %d(db_int(0, "PRAGMA %s.freelist_count", zDb)) free pages, |
| 138 | 132 | @ %s(db_text(0, "PRAGMA %s.encoding", zDb)), |
| 139 | 133 | @ %s(db_text(0, "PRAGMA %s.journal_mode", zDb)) mode |
| 140 | 134 |
| --- src/stat.c | |
| +++ src/stat.c | |
| @@ -112,28 +112,22 @@ | |
| 112 | @ </td></tr> |
| 113 | } |
| 114 | @ <tr><th>Duration Of Project:</th><td> |
| 115 | n = db_int(0, "SELECT julianday('now') - (SELECT min(mtime) FROM event)" |
| 116 | " + 0.99"); |
| 117 | @ %d(n) days |
| 118 | sqlite3_snprintf(sizeof(zBuf), zBuf, "%.2f", n/365.24); |
| 119 | @ or approximately %s(zBuf) years |
| 120 | @ </td></tr> |
| 121 | @ <tr><th>Project ID:</th><td>%h(db_get("project-code",""))</td></tr> |
| 122 | @ <tr><th>Server ID:</th><td>%h(db_get("server-code",""))</td></tr> |
| 123 | |
| 124 | @ <tr><th>Fossil Version:</th><td> |
| 125 | @ %h(RELEASE_VERSION) %h(MANIFEST_DATE) %h(MANIFEST_VERSION) |
| 126 | @ (%h(COMPILER_NAME)) |
| 127 | @ </td></tr> |
| 128 | @ <tr><th>SQLite Version:</th><td> |
| 129 | sqlite3_snprintf(sizeof(zBuf), zBuf, "%.19s [%.10s] (%s)", |
| 130 | SQLITE_SOURCE_ID, &SQLITE_SOURCE_ID[20], SQLITE_VERSION); |
| 131 | zDb = db_name("repository"); |
| 132 | @ %s(zBuf) |
| 133 | @ </td></tr> |
| 134 | @ <tr><th>Database Stats:</th><td> |
| 135 | @ %d(db_int(0, "PRAGMA %s.page_count", zDb)) pages, |
| 136 | @ %d(db_int(0, "PRAGMA %s.page_size", zDb)) bytes/page, |
| 137 | @ %d(db_int(0, "PRAGMA %s.freelist_count", zDb)) free pages, |
| 138 | @ %s(db_text(0, "PRAGMA %s.encoding", zDb)), |
| 139 | @ %s(db_text(0, "PRAGMA %s.journal_mode", zDb)) mode |
| 140 |
| --- src/stat.c | |
| +++ src/stat.c | |
| @@ -112,28 +112,22 @@ | |
| 112 | @ </td></tr> |
| 113 | } |
| 114 | @ <tr><th>Duration Of Project:</th><td> |
| 115 | n = db_int(0, "SELECT julianday('now') - (SELECT min(mtime) FROM event)" |
| 116 | " + 0.99"); |
| 117 | @ %d(n) days or approximately %.2f(n/356.24) years. |
| 118 | @ </td></tr> |
| 119 | @ <tr><th>Project ID:</th><td>%h(db_get("project-code",""))</td></tr> |
| 120 | @ <tr><th>Server ID:</th><td>%h(db_get("server-code",""))</td></tr> |
| 121 | @ <tr><th>Fossil Version:</th><td> |
| 122 | @ %h(RELEASE_VERSION) %h(MANIFEST_DATE) %h(MANIFEST_VERSION) |
| 123 | @ (%h(COMPILER_NAME)) |
| 124 | @ </td></tr> |
| 125 | @ <tr><th>SQLite Version:</th><td>%.19s(SQLITE_SOURCE_ID) |
| 126 | @ [%.10s(&SQLITE_SOURCE_ID[20])] (%s(SQLITE_VERSION))</td></tr> |
| 127 | @ <tr><th>Database Stats:</th><td> |
| 128 | zDb = db_name("repository"); |
| 129 | @ %d(db_int(0, "PRAGMA %s.page_count", zDb)) pages, |
| 130 | @ %d(db_int(0, "PRAGMA %s.page_size", zDb)) bytes/page, |
| 131 | @ %d(db_int(0, "PRAGMA %s.freelist_count", zDb)) free pages, |
| 132 | @ %s(db_text(0, "PRAGMA %s.encoding", zDb)), |
| 133 | @ %s(db_text(0, "PRAGMA %s.journal_mode", zDb)) mode |
| 134 |