normalise: introduce setcanddesc

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/normalise b/normalise
index 7db074006a9f6627376b7e88ea5276c0b859318f..df9e46763b3918bab064a9002538478dfc3f02f5 100755 (executable)
--- a/normalise
+++ b/normalise
@@ -35,6 +35,16 @@ sub normalise_opts ($) {
     return " | @o";
 }
 
     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/^\#/;
 while (<>) {
     next unless m/\S/;
     next if m/^\#/;


@@ -47,11 +57,7 @@ while (<>) {
 print STDERR Dumper($1,$2,$3);
        my ($cand,$desc,$opts) = ($1,$2,$3);
        push @{ $candidates{$cand}{Opts} }, normalise_opts $opts;
 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;
     } elsif (m/^($candvoter_re?)?\s*\:([^|]*)(?:\|(.*))?$/) {
        my ($voter,$opts) = ($1,$3);
        my @p;