From: Mike G. v. a. <we...@ma...> - 2010-05-14 02:08:52
|
Log Message: ----------- major update which adds objective methods to the basic code of PG. HEAD should be considered more beta than usual for a few days until minor glitches are shaken out. new modules needed: PGcore PGalias PGresource PGloadfiles PGanswergroup PGresponsegroup Tie::IxHash Modified Files: -------------- pg/lib/Value: AnswerChecker.pm Revision Data ------------- Index: AnswerChecker.pm =================================================================== RCS file: /webwork/cvs/system/pg/lib/Value/AnswerChecker.pm,v retrieving revision 1.128 retrieving revision 1.129 diff -Llib/Value/AnswerChecker.pm -Llib/Value/AnswerChecker.pm -u -r1.128 -r1.129 --- lib/Value/AnswerChecker.pm +++ lib/Value/AnswerChecker.pm @@ -366,13 +366,15 @@ sub ans_matrix { my $self = shift; my ($extend,$name,$rows,$cols,$size,$open,$close,$sep) = @_; - my $named_extension = pgRef('NAMED_ANS_RULE_EXTENSION'); - my $new_name = pgRef('RECORD_FORM_LABEL'); + #my $named_extension = pgRef('NAMED_ANS_RULE_EXTENSION'); + my $named_extension = pgRef('NAMED_ANS_ARRAY_EXTENSION'); + my $new_name = sub {@_}; # pgRef('RECORD_EXTRA_ANSWERS'); my $HTML = ""; my $ename = $name; if ($name eq '') { - my $n = pgCall('inc_ans_rule_count'); + #my $n = pgCall('inc_ans_rule_count'); $name = pgCall('NEW_ANS_NAME',$n); - $ename = $answerPrefix.$n; + #$name = pgCall('NEW_ARRAY_NAME',$n); + $ename = "${answerPrefix}_${name}_"; } $self->{ans_name} = $ename; $self->{ans_rows} = $rows; @@ -382,10 +384,15 @@ my @row = (); foreach my $j (0..$cols-1) { if ($i == 0 && $j == 0) { - if ($extend) {push(@row,&$named_extension(&$new_name($name),$size))} - else {push(@row,pgCall('NAMED_ANS_RULE',$name,$size))} + if ($extend) { + push(@row,&$named_extension(&$new_name($name),$size,ans_label=>$name)); + #push(@row,&$named_extension(&$new_name($name),$size)) + }else { + push(@row,pgCall('NAMED_ANS_RULE',$name,$size)) + } } else { - push(@row,&$named_extension(&$new_name(ANS_NAME($ename,$i,$j)),$size)); + push(@row,&$named_extension(&$new_name(ANS_NAME($ename,$i,$j)),$size,ans_label=>$name)); + #push(@row,&$named_extension(&$new_name(ANS_NAME($ename,$i,$j)),$size,ans_label=>$name)); } } push(@array,[@row]); |