Merge branch 'master' of woozle.org:/home/neale/projects/ctf/base

This commit is contained in:
James Wernicke 2015-05-28 13:44:04 -06:00
commit 9b5a65e786
1 changed files with 8 additions and 7 deletions

View File

@ -17,14 +17,14 @@ BEGIN {
teamno = ++nteams;
teams[hash] = teamno;
getline teamnames[teamno] < ("state/teams/" hash)
getline teamnames[hash] < ("state/teams/" hash)
}
if (NR > 1) {
# JSON sucks.
print ",";
}
printf("[%d, \"%d\", \"%s\", %d]", ts, teamno, cat, points);
printf("[%d, \"%s\", \"%s\", %d]", ts, hash, cat, points);
}
END {
@ -32,11 +32,12 @@ END {
print " ],";
print " \"teams\": {";
for (i = 1; i <= nteams; i += 1) {
if (i > 1) {
print ",";
}
printf("\"%d\": \"%s\"", i, teamnames[i]);
i = 0
for (hash in teamnames) {
if (i++) {
print ",";
}
printf("\"%s\": \"%s\"", hash, teamnames[hash]);
}
print "";