Start some cleanup of Election code.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

4 files changed, 10 insertions, 69 deletions

diff --git a/Votify.pm b/Votify.pm
index c99685d..1be8de7 100644
--- a/Votify.pm
+++ b/Votify.pm
@@ -1,6 +1,6 @@
 # $Id: Votify.pm,v 1.5 2005/05/16 23:58:09 agriffis Exp $
 #
-# Copyright 2005 Gentoo Foundation
+# Copyright 2005-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 #
 # votify.pm: common classes for votify and countify
@@ -14,6 +14,7 @@ use strict;
 
 our ($datadir) = '/etc/elections/current';
 (our $zero = $0) =~ s,.*/,,;
+our $version = '1.6';
 
 sub import {
     my ($class, $mode) = @_;
@@ -642,43 +643,4 @@ sub to_s {
 1;
 
 __END__
-
-$Log: Votify.pm,v $
-Revision 1.5  2005/05/16 23:58:09  agriffis
-change wording
-
-Revision 1.4  2005/05/16 18:40:07  agriffis
-fix shortname calculation
-
-Revision 1.3  2005/05/16 18:10:46  agriffis
-ranking works completely now, even if it needs badly to be refactored
-
-Revision 1.2  2005/05/16 04:03:46  agriffis
-add first pass at countify --rank
-
-
-__END__
-
-$Log: Votify.pm,v $
-Revision 1.5  2005/05/16 23:58:09  agriffis
-change wording
-
-Revision 1.4  2005/05/16 18:40:07  agriffis
-fix shortname calculation
-
-Revision 1.3  2005/05/16 18:10:46  agriffis
-ranking works completely now, even if it needs badly to be refactored
-
-Revision 1.2  2005/05/16 04:03:46  agriffis
-add first pass at countify --rank
-
-Revision 1.3  2005/05/09 23:12:02  agriffis
-Add support for registered voters
-
-Revision 1.2  2005/05/05 23:03:46  agriffis
-Fix indentation (and some output as well)
-
-Revision 1.1  2005/05/05 22:05:34  agriffis
-first pass at Gentoo Foundation voting program
-
 # vim:sw=4 et
diff --git a/countify b/countify
index a831d4b..975a7ec 100755
--- a/countify
+++ b/countify
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 # $Id: countify,v 1.3 2005/05/16 18:10:46 agriffis Exp $
 #
-# Copyright 2005 Gentoo Foundation
+# Copyright 2005-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 #
 # countify: collect, tabulate and announce ballot results
@@ -21,7 +21,7 @@ use strict;
 ######################################################################
 
 (my $zero = $0) =~ s,.*/,,;
-(my $version = '$Revision: 1.3 $') =~ s/.*?(\d.*\d).*/$zero version $1\n/;
+(my $version = $Votify::version) =~ s/.*?(\d.*\d).*/$zero version $1\n/;
 my %opt;
 
 sub grabfile_int {
@@ -162,13 +162,4 @@ if ($opt{'rank'}) {
 }
 
 __END__
-
-$Log: countify,v $
-Revision 1.3  2005/05/16 18:10:46  agriffis
-ranking works completely now, even if it needs badly to be refactored
-
-Revision 1.2  2005/05/16 04:03:46  agriffis
-add first pass at countify --rank
-
-
 # vim:sw=4 et
diff --git a/listify b/listify
index c7fdf80..10b4b82 100755
--- a/listify
+++ b/listify
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 # $Id: votify,v 1.5 2005/05/16 04:03:46 agriffis Exp $
 #
-# Copyright 2005 Gentoo Foundation
+# Copyright 2005-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 #
 # votify: generate, verify and submit voting ballots for trustee elections
@@ -21,7 +21,7 @@ use strict;
 ######################################################################
 
 (my $zero = $0) =~ s,.*/,,;
-(my $version = '$Revision: 1.5 $') =~ s/.*?(\d.*\d).*/$zero version $1\n/;
+(my $version = $Votify::version) =~ s/.*?(\d.*\d).*/$zero version $1\n/;
 my (%opt, %elections);
 
 sub grabfile_int {
@@ -76,4 +76,6 @@ EOF
 
 print $usage_elections;
 exit;
+
+__END__
 # vim:sw=4 et
diff --git a/votify b/votify
index 94c532a..40607b7 100755
--- a/votify
+++ b/votify
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 # $Id: votify,v 1.5 2005/05/16 04:03:46 agriffis Exp $
 #
-# Copyright 2005 Gentoo Foundation
+# Copyright 2005-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 #
 # votify: generate, verify and submit voting ballots for trustee elections
@@ -21,7 +21,7 @@ use strict;
 ######################################################################
 
 (my $zero = $0) =~ s,.*/,,;
-(my $version = '$Revision: 1.5 $') =~ s/.*?(\d.*\d).*/$zero version $1\n/;
+(my $version = $Votify::version) =~ s/.*?(\d.*\d).*/$zero version $1\n/;
 my (%opt);
 
 sub grabfile_int {
@@ -226,18 +226,4 @@ EOF
 }
 
 __END__
-
-$Log: votify,v $
-Revision 1.5  2005/05/16 04:03:46  agriffis
-add first pass at countify --rank
-
-Revision 1.3  2005/05/09 23:12:02  agriffis
-Add support for registered voters
-
-Revision 1.2  2005/05/05 23:03:46  agriffis
-Fix indentation (and some output as well)
-
-Revision 1.1  2005/05/05 22:05:34  agriffis
-first pass at Gentoo Foundation voting program
-
 # vim:sw=4 et