Diff for /loncom/homework/radiobuttonresponse.pm between versions 1.17 and 1.18

version 1.17, 2001/05/04 21:19:37 version 1.18, 2001/05/31 22:34:33
Line 12  sub BEGIN { Line 12  sub BEGIN {
 sub start_radiobuttonresponse {  sub start_radiobuttonresponse {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   #when in a radiobutton response use these    #when in a radiobutton response use these
   &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil'));    &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
   my $id = &Apache::response::start_response($parstack,$safeeval);    my $id = &Apache::response::start_response($parstack,$safeeval);
   return '';    return '';
 }  }
Line 25  sub end_radiobuttonresponse { Line 25  sub end_radiobuttonresponse {
 %Apache::response::foilgroup={};  %Apache::response::foilgroup={};
 sub start_foilgroup {  sub start_foilgroup {
   %Apache::response::foilgroup={};    %Apache::response::foilgroup={};
   $Apache::optionresponse::conceptgroup=0;    $Apache::radiobuttonresponse::conceptgroup=0;
   &Apache::response::setrandomnumber();    &Apache::response::setrandomnumber();
   return '';    return '';
 }  }
Line 146  sub displayfoils { Line 146  sub displayfoils {
       &Apache::lonxml::error("Unknown state $Apache::response::foilgroup{$name.'.value'} for $name in <foilgroup>");        &Apache::lonxml::error("Unknown state $Apache::response::foilgroup{$name.'.value'} for $name in <foilgroup>");
     }      }
   }    }
   my $whichtrue = rand $#truelist;    my $whichtrue = int(rand($#truelist+1));
   &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");    &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
   my @whichfalse =();    my @whichfalse =();
   while ((($#whichfalse+1) < $max) && ($#falselist > -1)) {    while ((($#whichfalse+1) < $max) && ($#falselist > -1)) {
     my $afalse=rand $#falselist;      &Apache::lonxml::debug("Have $#whichfalse max is $max");
       my $afalse=int(rand($#falselist+1));
     &Apache::lonxml::debug("From $#falselist elms, picking $afalse");      &Apache::lonxml::debug("From $#falselist elms, picking $afalse");
     $afalse=splice(@falselist,$afalse,1);      $afalse=splice(@falselist,$afalse,1);
     &Apache::lonxml::debug("Picked $afalse");      &Apache::lonxml::debug("Picked $afalse");
Line 184  sub displayfoils { Line 185  sub displayfoils {
 }  }
   
 sub start_conceptgroup {  sub start_conceptgroup {
   $Apache::optionresponse::conceptgroup=1;      $Apache::radiobuttonresponse::conceptgroup=1;
   %Apache::response::conceptgroup={};    %Apache::response::conceptgroup={};
   return '';    return '';
 }  }
   
 sub end_conceptgroup {  sub end_conceptgroup {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   $Apache::optionresponse::conceptgroup=0;      $Apache::radiobuttonresponse::conceptgroup=0;
   if ($target eq 'web' || $target eq 'grade') {    if ($target eq 'web' || $target eq 'grade') {
     my @names = @{ $Apache::response::conceptgroup{'names'} };      my @names = @{ $Apache::response::conceptgroup{'names'} };
     my $pick=int rand $#names+1;      my $pick=int rand $#names+1;
Line 215  sub start_foil { Line 216  sub start_foil {
   
 sub end_foil {  sub end_foil {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   my $foil=&Apache::lonxml::endredirection;    my $text='';
     if ($target eq 'web') { $text=&Apache::lonxml::endredirection; }
   if ($target eq 'web' || $target eq 'grade') {    if ($target eq 'web' || $target eq 'grade') {
     my $args ='';      my $args ='';
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }      if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
     my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);  
     push @{ $Apache::response::foilgroup{'names'} }, $name;  
     my $value = &Apache::run::run("{$args;".'return $value}',$safeeval);      my $value = &Apache::run::run("{$args;".'return $value}',$safeeval);
     $Apache::response::foilgroup{"$name.value"} = $value;      if ($value ne 'unused') {
     $Apache::response::foilgroup{"$name.text"} = $foil;        my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
         if ( $Apache::radiobuttonresponse::conceptgroup ) {
    push @{ $Apache::response::conceptgroup{'names'} }, $name;
    $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.17  
changed lines
  Added in v.1.18


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