diff --git a/README.md b/README.md index 87ea5a4..16ab0dd 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,18 @@ Initialization -------------- +Decide on label of the election. We will refer to that as `$label`; +this label is to be passed as a parameter to `gen-ballot.pl` and +updated near the top of `web-ballot.pl`. The generated `votes.txt` +file contains this in its filename. + Copy `names-sample.txt` to `names.txt` or create your own `names.txt`. -Clobber your `~/votes.txt` file. +Clobber your `~/votes $label.txt` file. Generating Ballots ------------------ - ./gen-ballot.pl 15 tokens.txt + ./gen-ballot.pl 15 "testovaci komise" tokens.txt Web Ballot CGI Script --------------------- @@ -25,4 +30,4 @@ Counting Votes This script will show just the final vote for each token: - perl -nle 'chomp; @b = split/,/; $a{$b[0]} = [@b]; END { for (values %a) { print join(",", @$_); } }' ~/votes.txt + perl -nle 'chomp; @b = split/,/; $a{$b[0]} = [@b]; END { for (values %a) { print join(",", @$_); } }' ~/'votes testovaci komise'.txt diff --git a/gen-ballot.pl b/gen-ballot.pl index 78394f7..156fbf5 100755 --- a/gen-ballot.pl +++ b/gen-ballot.pl @@ -20,7 +20,7 @@ our $fontface = 'Arial'; our $ffontface = 'Courier New'; # large, normal, small our @fontsize = (26, 11, 8); -our @linespacing = (18, 13, 8); +our @linespacing = (18, 13, 3); our $topmargin = 2; our $contact = 'brmelect: your votes are safe with us'; @@ -33,7 +33,8 @@ use List::Util qw(min); use List::MoreUtils qw(pairwise); use Cairo; -my $n_ballots = pop @ARGV; +my $n_ballots = shift @ARGV; +my $label = shift @ARGV; my @names; while (<>) { chomp; @@ -136,6 +137,7 @@ sub ballot { my $tok = gen_token(); print($tok."\n"); ballot_text_centered($cr, \$ypos, $fontface, 'italic', 'normal', 2, $tok); + ballot_text_centered($cr, \$ypos, $fontface, 'normal', 'bold', 2, $label); ballot_text_centered($cr, \$ypos, $fontface, 'italic', 'normal', 2, $contact); } diff --git a/web-ballot.pl b/web-ballot.pl index 3610674..07fcab4 100755 --- a/web-ballot.pl +++ b/web-ballot.pl @@ -6,7 +6,8 @@ use v5.10; use CGI; -my $votefile = '/home/pasky/votes.txt'; +my $label = 'testovaci komise'; +my $votefile = "/home/pasky/votes $label.txt"; our @names; open my $fh, "names.txt" or die "$!"; @@ -39,7 +40,7 @@ print < -

brmelect Web Ballot

+

brmelect Web Ballot: $label