return " | @o";
}
+sub setcanddesc ($$) {
+ my ($cand,$desc) = @_;
+
+ if (length $desc) {
+ badinput "multiple descriptions for $cand" if
+ defined $candidates{$cand}{Desc};
+ $candidates{$cand}{Desc} = $desc;
+ }
+}
+
while (<>) {
next unless m/\S/;
next if m/^\#/;
print STDERR Dumper($1,$2,$3);
my ($cand,$desc,$opts) = ($1,$2,$3);
push @{ $candidates{$cand}{Opts} }, normalise_opts $opts;
- if (length $desc) {
- badinput "multiple descriptions for $cand" if
- defined $candidates{$cand}{Desc};
- $candidates{$cand}{Desc} = $desc;
- }
+ setcanddesc $cand, $desc;
} elsif (m/^($candvoter_re?)?\s*\:([^|]*)(?:\|(.*))?$/) {
my ($voter,$opts) = ($1,$3);
my @p;