die $errortext . ": $_\n\n" if ($errortext);
# check for correct characters in conditions
- if ($if !~ /^[JjNnEeSsIi\.]+$/) {
+ if ($if !~ /^[JjNnEeSsHhIi\.]+$/) {
die UVmessage::get ("RULES_INVCHARS", (NUM=>$num+1, TYPE=>"if")) . ": $if\n\n";
- } elsif ($then !~ /^[JjNnEeSsIi\.]+$/) {
+ } elsif ($then !~ /^[JjNnEeSsHhIi\.]+$/) {
die UVmessage::get ("RULES_INVCHARS",
(NUM=>$num+1, TYPE=>"if")) . ": $then\n\n";
}
sub make_regex_pos {
my $pat = $_[0];
- $pat =~ s/[jens]/./g;
+ $pat =~ s/[hijens]/./g;
$pat =~ s/S/[JN]/g;
+ $pat =~ s/H/[EJ]/g;
$pat =~ s/I/[EN]/g;
return $pat;
# upper case characters are replaced with dots
# (are covered by make_regex_pos)
- $pat =~ s/[JENS]/./g;
+ $pat =~ s/[HIJENS]/./g;
# reverse lower case characters
$pat =~ s/j/[NE]/g;
$pat =~ s/n/[JE]/g;
$pat =~ s/e/[JN]/g;
$pat =~ s/s/E/g;
+ $pat =~ s/h/N/g;
$pat =~ s/i/J/g;
- # to be translated:
- # Falls keine Kleinbuchstaben vorkamen (es sind nur Punkte uebrig):
- # Wenn keine optionalen Forderungen vorhanden sind, wuerde der Regex
- # immer matchen und somit die Stimme immer als nicht passend erkannt
- # werden. Deswegen wird versucht auf den leeren String zu ueberpruefen,
- # was durch die Negation dazu fuehrt, dass die Stimme als passend
- # gewertet wird.
+ # If the string contained only upper case characters they are now all
+ # replaced with dots and the RegEx would match everything, i.e. declare
+ # every vote as invalid. In this case an empty pattern is returned.
$pat =~ s/^\.+$//;
return $pat;
$fill = " $and ";
$text1 = UVmessage::get ("RULES_IFCLAUSE",
(VOTE=>"$yes $or $no", GROUP=>$groups[$i]));
+ } elsif ($rule[$i] eq 'H') {
+ $fill = " $and ";
+ $text1 = UVmessage::get ("RULES_IFCLAUSE",
+ (VOTE=>"$abst $or $yes", GROUP=>$groups[$i]));
} elsif ($rule[$i] eq 'I') {
$fill = " $and ";
$text1 = UVmessage::get ("RULES_IFCLAUSE",
$fill = " $or ";
$text1 = UVmessage::get ("RULES_IFCLAUSE",
(VOTE=>"$yes $or $no", GROUP=>$groups[$i]));
+ } elsif ($rule[$i] eq 'h') {
+ $fill = " $or ";
+ $text1 = UVmessage::get ("RULES_IFCLAUSE",
+ (VOTE=>"$abst $or $yes", GROUP=>$groups[$i]));
} elsif ($rule[$i] eq 'i') {
$fill = " $or ";
$text1 = UVmessage::get ("RULES_IFCLAUSE",
$fill = " $and ";
$text1 = UVmessage::get ("RULES_THENCLAUSE",
(VOTE=>"$yes $or $no", GROUP=>$groups[$i]));
+ } elsif ($rule[$i] eq 'H') {
+ $fill = " $and ";
+ $text1 = UVmessage::get ("RULES_THENCLAUSE",
+ (VOTE=>"$abst $or $yes", GROUP=>$groups[$i]));
} elsif ($rule[$i] eq 'I') {
$fill = " $and ";
$text1 = UVmessage::get ("RULES_THENCLAUSE",
$fill = " $or ";
$text1 = UVmessage::get ("RULES_THENCLAUSE",
(VOTE=>"$yes $or $no", GROUP=>$groups[$i]));
+ } elsif ($rule[$i] eq 'h') {
+ $fill = " $or ";
+ $text1 = UVmessage::get ("RULES_THENCLAUSE",
+ (VOTE=>"$abst $or $yes", GROUP=>$groups[$i]));
} elsif ($rule[$i] eq 'i') {
$fill = " $or ";
$text1 = UVmessage::get ("RULES_THENCLAUSE",