epita-std/ACU
Archived
1
0
Fork 0
Code Releases Activity

Handel $LOGIN in grades

Browse source
This commit is contained in:
Mercier Pierre-Olivier 2013-09-26 01:05:31 +02:00
parent 9160fa0fb2
commit 025e938354
2 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
ACU/Grading.pm
View file

@ -143,13 +143,14 @@ sub toString ($)
return $doc->toString();
}
sub compute ($)
sub compute ($;$)
{
my $self = shift;
my $login = shift;
my $sum = 0;
for my $grade (@{ $self->{tree} }) {
my $tmp = $grade->compute($self->{operators}, $self->{ids});
my $tmp = $grade->compute($self->{operators}, $self->{ids}, $login);
$sum += $tmp if $tmp;
}
@ -159,12 +160,13 @@ sub compute ($)
sub computeXML ($;$)
{
my $self = shift;
my $login = shift;
my $doc = XML::LibXML::Document->new('1.0');
my $root = $doc->createElement("grading");
for my $grade (@{ $self->{tree} }) {
$grade->compute($self->{operators}, $self->{ids}, $doc, $root);
$grade->compute($self->{operators}, $self->{ids}, $login, $doc, $root);
}
$root->addChild( $doc->createAttribute("max", $self->{max}) );
@ -222,11 +224,12 @@ sub append ($@)
push @{ $self->{tree} }, @_;
}
sub compute ($$$;$$)
sub compute ($$$;$$$)
{
my $self = shift;
my $operators = shift;
my $ids = shift;
my $login = shift;
my $doc = shift;
my $parent = shift;
my @current = ();
@ -324,18 +327,25 @@ sub getValue ($$)
return $ids->{ $self->{ref} };
}
sub compute ($$$;$$)
sub compute ($$$;$$$)
{
my $self = shift;
my $operators = shift;
my $ids = shift;
my $login = shift;
my $ref = $self->{ref};
if ($login && $ref) {
$ref =~ s/\$LOGIN/$login/;
}
my $ret = undef;
my $result = (
# No condition on refs nor qversion?
! defined $self->{ref}
! defined $ref
# Condition on refs
|| grep { $self->{ref} eq $_ } keys %$ids
|| grep { $ref eq $_ } keys %$ids
);
# Handel not
@ -346,11 +356,11 @@ sub compute ($$$;$$)
if ($main::debug)
{
my $str = "not=".($self->{not}//0).", qversion".($self->{qversion}//"*").", ref=".($self->{ref}//"").",\tvalue=".($ids->{ $self->{ref}//"" } // "undef").", got=".($ret // 0);
my $str = "not=".($self->{not}//0).", qversion".($self->{qversion}//"*").", ref=".($ref//"").",\tvalue=".($ids->{ $ref//"" } // "undef").", ";
if ($result) {
say GREEN, ">>>", RESET, " Matching point: ", $str;
say GREEN, ">>>", RESET, " Matching point: ", $str, BOLD, "got=".($ret // 0), RESET;
} else {
say RED, " * ", RESET, " Skipped point: ", $str;
say RED, " * ", RESET, " Skipped point: ", $str, BOLD, "got=".($ret // 0), RESET;
}
}

2
process/files/intradata_get.pl
View file

@ -133,7 +133,7 @@ sub grades_generate
}
}
log DEBUG, "Computed grades: ".$grading->compute();
log DEBUG, "Computed grades: ".$grading->compute($login);
open my $xmlgrade, ">", "$basedir/$year/$project_id/grades/$login.xml" or croak "grades/$login.xml";
binmode $xmlgrade;