Diff for /loncom/homework/optionresponse.pm between versions 1.4 and 1.5

version 1.4, 2001/02/22 00:49:03 version 1.5, 2001/03/01 00:59:33
Line 24  sub end_optionresponse { Line 24  sub end_optionresponse {
 %Apache::response::foilgroup={};  %Apache::response::foilgroup={};
 sub start_foilgroup {  sub start_foilgroup {
   %Apache::response::foilgroup={};    %Apache::response::foilgroup={};
     $Apache::optionresponse::conceptgroup=0;  
     &setrandomnumber();
   return '';    return '';
 }  }
   
Line 34  sub setrandomnumber { Line 36  sub setrandomnumber {
     +&Apache::lonnet::numval($Apache::inputtags::part)      +&Apache::lonnet::numval($Apache::inputtags::part)
       +&Apache::lonnet::numval($Apache::inputtags::response['-1']);        +&Apache::lonnet::numval($Apache::inputtags::response['-1']);
   srand($rndseed);    srand($rndseed);
     &Apache::lonxml::debug("randseed $rndseed");
   return '';    return '';
 }  }
   
Line 43  sub end_foilgroup { Line 46  sub end_foilgroup {
   my $result;    my $result;
   if ($target ne 'meta') {    if ($target ne 'meta') {
     my $name;      my $name;
     &setrandomnumber();  
     my ($count,$max) = &getfoilcounts($parstack,$safeeval);      my ($count,$max) = &getfoilcounts($parstack,$safeeval);
     if ($count>$max) { $count=$max }       if ($count>$max) { $count=$max } 
     &Apache::lonxml::debug("Count is $count from $max");      &Apache::lonxml::debug("Count is $count from $max");
Line 137  sub displayfoils { Line 139  sub displayfoils {
   return $result."<br />";    return $result."<br />";
 }  }
   
   
 sub start_conceptgroup {  sub start_conceptgroup {
     $Apache::optionresponse::conceptgroup=1;  
     %Apache::response::conceptgroup={};
     return '';
 }  }
   
 sub end_conceptgroup {  sub end_conceptgroup {
     my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
     $Apache::optionresponse::conceptgroup=0;  
     if ($target eq 'web' || $target eq 'grade') {
       my @names = @{ $Apache::response::conceptgroup{'names'} };
       my $pick=int rand $#names+1;
       my $name=$names[$pick];
       push @{ $Apache::response::foilgroup{'names'} }, $name;
       $Apache::response::foilgroup{"$name.value"} =  $Apache::response::conceptgroup{"$name.value"};
       $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};
       my $args;
       if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
       my $concept = &Apache::run::run("{$args;".'return $concept}',$safeeval);
       $Apache::response::foilgroup{"$name.concept"} = $concept;
       &Apache::lonxml::debug("Selecting $name in $concept");
     }
     return '';
 }  }
   
 sub start_foil {  sub start_foil {
Line 159  sub end_foil { Line 181  sub end_foil {
     my $value = &Apache::run::run("{$args;".'return $value}',$safeeval);      my $value = &Apache::run::run("{$args;".'return $value}',$safeeval);
     if ($value ne 'unused') {      if ($value ne 'unused') {
       my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);        my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
       push @{ $Apache::response::foilgroup{'names'} }, $name;        if ( $Apache::optionresponse::conceptgroup ) {
       $Apache::response::foilgroup{"$name.value"} = $value;   push @{ $Apache::response::conceptgroup{'names'} }, $name;
       $Apache::response::foilgroup{"$name.text"} = $text;   $Apache::response::conceptgroup{"$name.value"} = $value;
    $Apache::response::conceptgroup{"$name.text"} = $text;
         } else {
    push @{ $Apache::response::foilgroup{'names'} }, $name;
    $Apache::response::foilgroup{"$name.value"} = $value;
    $Apache::response::foilgroup{"$name.text"} = $text;
         }
     }      }
   }    }
   return '';    return '';

Removed from v.1.4  
changed lines
  Added in v.1.5


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>