--- loncom/homework/default_homework.lcpm 2002/11/13 23:05:46 1.54 +++ loncom/homework/default_homework.lcpm 2003/02/12 22:45:01 1.57 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # used by lonxml::xmlparse() as input variable $safeinit to Apache::run::run() # -# $Id: default_homework.lcpm,v 1.54 2002/11/13 23:05:46 albertel Exp $ +# $Id: default_homework.lcpm,v 1.57 2003/02/12 22:45:01 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -152,6 +152,8 @@ sub get_array_args { sub caparesponse_check_list { my ($response,$expr)=@_; my $result; + $expr =~ s/\\/\\\\/g; + $expr =~ s/\'/\\\'/g; my ($result,@list) = &get_array_args($expr,'answer'); my $aresult=''; my $current_answer; @@ -180,12 +182,15 @@ sub caparesponse_check_list { my $awards=''; for ($i=0; $i<@list;$i++) { $result.="trying answer :$list[$i]:\n"; + my $thisanswer=$list[$i]; + $thisanswer=~ s/\\/\\\\/g; + $thisanswer =~ s/\'/\\\'/g; if ($unit eq '') { $aresult=&caparesponse_check($responselist[$i], - $expr.';my $answer=\''.$list[$i].'\';'); + $expr.';my $answer=\''.$thisanswer.'\';'); } else { $aresult=&caparesponse_check($responselist[$i]." $unit", - $expr.';my $answer=\''.$list[$i].'\';'); + $expr.';my $answer=\''.$thisanswer.'\';'); } my ($temp)=split /:/, $aresult; $awards.="$temp,"; @@ -240,7 +245,8 @@ sub hinton { sub random { my ($start,$end,$step)=@_; if ( ! $hidden::RANDOMINIT ) { - &random_set_seed(1,$external::randomseed); + if ($external::randomseed == 0) { $external::randomseed=1; } + &random_set_seed(1,int(abs($external::randomseed))); &math_random_uniform(); $hidden::RANDOMINIT=1; } @@ -566,7 +572,7 @@ sub map { } } } - &random_set_seed(@seed); + &random_set_seed(@oldseed); return ''; }