[BACK]Return to imageresponse.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/imageresponse.pm between versions 1.6 and 1.7

version 1.6, 2001/05/15 20:48:43 version 1.7, 2001/05/31 22:34:33
Line 13  sub BEGIN { Line 13  sub BEGIN {
 sub start_imageresponse {  sub start_imageresponse {
   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::imageresponse',('foilgroup','foil','text','image','rectangle'));    &Apache::lonxml::register('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
   push (@Apache::lonxml::namespace,'imageresponse');    push (@Apache::lonxml::namespace,'imageresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);    my $id = &Apache::response::start_response($parstack,$safeeval);
   return '';    return '';
Line 28  sub end_imageresponse { Line 28  sub end_imageresponse {
 %Apache::response::foilgroup={};  %Apache::response::foilgroup={};
 sub start_foilgroup {  sub start_foilgroup {
   %Apache::response::foilgroup={};    %Apache::response::foilgroup={};
   $Apache::optionresponse::conceptgroup=0;    $Apache::imageresponse::conceptgroup=0;
   &Apache::response::setrandomnumber();    &Apache::response::setrandomnumber();
   return '';    return '';
 }  }
   
 sub getfoilcounts {  sub getfoilcounts {
   my ($parstack,$safeeval)=@_;    my ($parstack,$safeeval)=@_;
   my $rrargs ='';  
   if ( $#$parstack > 0 ) { $rrargs=$$parstack['-2']; }    my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
   my $max = &Apache::run::run("{$rrargs;".'return $max}',$safeeval);    # +1 since instructors will count from 1
   my $count = $#{ $Apache::response::foilgroup{'names'} };    my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
   return ($count,$max);    return ($count,$max);
 }  }
   
Line 46  sub whichfoils { Line 46  sub whichfoils {
   my ($max)=@_;    my ($max)=@_;
   my @names = @{ $Apache::response::foilgroup{'names'} };    my @names = @{ $Apache::response::foilgroup{'names'} };
   my @whichopt =();    my @whichopt =();
   while ((($#whichopt) < $max) && ($#names > -1)) {    while ((($#whichopt+1) < $max) && ($#names > -1)) {
     my $aopt=int rand $#names;      &Apache::lonxml::debug("Have $#whichopt max is $max");
       my $aopt=int(rand($#names+1));
     &Apache::lonxml::debug("From $#names elms, picking $aopt");      &Apache::lonxml::debug("From $#names elms, picking $aopt");
     $aopt=splice(@names,$aopt,1);      $aopt=splice(@names,$aopt,1);
     &Apache::lonxml::debug("Picked $aopt");      &Apache::lonxml::debug("Picked $aopt");
Line 133  sub end_foilgroup { Line 134  sub end_foilgroup {
 }  }
   
 sub start_conceptgroup {  sub start_conceptgroup {
   $Apache::optionresponse::conceptgroup=1;      $Apache::imageresponse::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::imageresponse::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));
     my $name=$names[$pick];      my $name=$names[$pick];
     push @{ $Apache::response::foilgroup{'names'} }, $name;      push @{ $Apache::response::foilgroup{'names'} }, $name;
     $Apache::response::foilgroup{"$name.text"} = $Apache::response::conceptgroup{"$name.text"};      $Apache::response::foilgroup{"$name.text"} = $Apache::response::conceptgroup{"$name.text"};
     $Apache::response::foilgroup{"$name.image"} = $Apache::response::conceptgroup{"$name.image"};      $Apache::response::foilgroup{"$name.image"} = $Apache::response::conceptgroup{"$name.image"};
     push(@{ $Apache::response::foilgroup{"$name.area"} }, @{ $Apache::response::conceptgroup{"$name.area"} });      push(@{ $Apache::response::foilgroup{"$name.area"} }, @{ $Apache::response::conceptgroup{"$name.area"} });
     my $args;      my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }  
     my $concept = &Apache::run::run("{$args;".'return $concept}',$safeeval);  
     $Apache::response::foilgroup{"$name.concept"} = $concept;      $Apache::response::foilgroup{"$name.concept"} = $concept;
     &Apache::lonxml::debug("Selecting $name in $concept");      &Apache::lonxml::debug("Selecting $name in $concept");
   }    }
Line 162  $Apache::imageresponse::curname=''; Line 161  $Apache::imageresponse::curname='';
 sub start_foil {  sub start_foil {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web' || $target eq 'grade') {    if ($target eq 'web' || $target eq 'grade') {
     my $args ='';      my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }  
     my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);  
     if ($name eq '') { $name=$Apache::lonxml::curdepth; }      if ($name eq '') { $name=$Apache::lonxml::curdepth; }
     push(@{ $Apache::response::foilgroup{'names'} }, $name);      if ( $Apache::imageresponse::conceptgroup ) {
         push(@{ $Apache::response::conceptgroup{'names'} }, $name);
       } else {
         push(@{ $Apache::response::foilgroup{'names'} }, $name);
       }
     $Apache::imageresponse::curname=$name;      $Apache::imageresponse::curname=$name;
   }    }
   return '';    return '';
Line 187  sub end_text { Line 188  sub end_text {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web') {    if ($target eq 'web') {
     my $name = $Apache::imageresponse::curname;      my $name = $Apache::imageresponse::curname;
     $Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection;      if ( $Apache::imageresponse::conceptgroup ) {
         $Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection;
       } else {
         $Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection;
       }
   }    }
   return '';    return '';
 }  }
Line 204  sub end_image { Line 209  sub end_image {
     my $name = $Apache::imageresponse::curname;      my $name = $Apache::imageresponse::curname;
     my $image = &Apache::lonxml::endredirection;      my $image = &Apache::lonxml::endredirection;
     &Apache::lonxml::debug("out is $image");      &Apache::lonxml::debug("out is $image");
     $Apache::response::foilgroup{"$name.image"} = $image;      if ( $Apache::imageresponse::conceptgroup ) {
         $Apache::response::conceptgroup{"$name.image"} = $image;
       } else {
         $Apache::response::foilgroup{"$name.image"} = $image;
       }
   }    }
   return '';    return '';
 }  }
Line 236  sub end_rectangle { Line 245  sub end_rectangle {
     my $name = $Apache::imageresponse::curname;      my $name = $Apache::imageresponse::curname;
     my $area = &Apache::lonxml::endredirection;      my $area = &Apache::lonxml::endredirection;
     &Apache::lonxml::debug("out is $area for $name");      &Apache::lonxml::debug("out is $area for $name");
     push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area";      if ( $Apache::imageresponse::conceptgroup ) {
         push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area";
       } else {
         push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area";
       }
   }    }
   return '';    return '';
 }  }
Removed from v.1.6  
changed lines
  Added in v.1.7

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