neale/moth
neale
/
moth
mirror of https://github.com/dirtbags/moth.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
parent 498f0d20b4 47122fc720
commit c02d934a0b
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bin/points
View File

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