Diff for /loncom/homework/imageresponse.pm between versions 1.19 and 1.23

version 1.19, 2002/07/23 14:41:06 version 1.23, 2003/01/16 02:55:05
Line 30 Line 30
   
 package Apache::imageresponse;  package Apache::imageresponse;
 use strict;  use strict;
   use Image::Magick;
   
 BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::imageresponse',('imageresponse'));    &Apache::lonxml::register('Apache::imageresponse',('imageresponse'));
Line 55  sub end_imageresponse { Line 56  sub end_imageresponse {
   return '';    return '';
 }  }
   
 %Apache::response::foilgroup={};  %Apache::response::foilgroup=();
 sub start_foilgroup {  sub start_foilgroup {
   %Apache::response::foilgroup={};    %Apache::response::foilgroup=();
   $Apache::imageresponse::conceptgroup=0;    $Apache::imageresponse::conceptgroup=0;
   &Apache::response::setrandomnumber();    &Apache::response::setrandomnumber();
   return '';    return '';
Line 84  sub whichfoils { Line 85  sub whichfoils {
     if (&Apache::response::showallfoils()) {      if (&Apache::response::showallfoils()) {
       $aopt=0;        $aopt=0;
     } else {      } else {
       $aopt=int(rand($#names+1));        $aopt=int(&Math::Random::random_uniform() * ($#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);
Line 114  sub displayfoils { Line 115  sub displayfoils {
   
 sub gradefoils {  sub gradefoils {
   my (@whichopt) = @_;    my (@whichopt) = @_;
   my $result='';  
   my $x;    my $x;
   my $y;    my $y;
   my $result;    my $result;
Line 174  sub end_foilgroup { Line 174  sub end_foilgroup {
   
 sub start_conceptgroup {  sub start_conceptgroup {
   $Apache::imageresponse::conceptgroup=1;    $Apache::imageresponse::conceptgroup=1;
   %Apache::response::conceptgroup={};    %Apache::response::conceptgroup=();
   return '';    return '';
 }  }
   
Line 184  sub end_conceptgroup { Line 184  sub end_conceptgroup {
   if ($target eq 'web' || $target eq 'grade') {    if ($target eq 'web' || $target eq 'grade') {
     if (defined(@{ $Apache::response::conceptgroup{'names'} })) {      if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
       my @names = @{ $Apache::response::conceptgroup{'names'} };        my @names = @{ $Apache::response::conceptgroup{'names'} };
       my $pick=int(rand($#names+1));        my $pick=int(&Math::Random::random_uniform() * ($#names+1));
       my $name=$names[$pick];        my $name=$names[$pick];
       if (defined(@{ $Apache::response::conceptgroup{"$name.area"} })) {        if (defined(@{ $Apache::response::conceptgroup{"$name.area"} })) {
  push @{ $Apache::response::foilgroup{'names'} }, $name;   push @{ $Apache::response::foilgroup{'names'} }, $name;
Line 324  sub end_image { Line 324  sub end_image {
     #where can we find the picture?      #where can we find the picture?
     if (-e $newsrc) {      if (-e $newsrc) {
  if ($path) {   if ($path) {
     $currentstring .= '\vskip 0 mm \noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';      $currentstring .= '\vskip 0 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
  }   }
     } else {      } else {
  my $temp_file;   my $temp_file;
  my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";   my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
  $temp_file = Apache::File->new('>>'.$filename);    $temp_file = Apache::File->new('>>'.$filename); 
  print $temp_file "$src\n";   print $temp_file "$src\n";
  $currentstring .= '\vskip 0 mm \graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';   $currentstring .= '\vskip 0 mm \graphicspath{{/home/httpd/prtspool/}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
     }      }
  }    } 
   return $currentstring;    return $currentstring;

Removed from v.1.19  
changed lines
  Added in v.1.23


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