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

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

version 1.23, 2003/01/16 02:55:05 version 1.31, 2003/06/09 22:42:49
Line 26 Line 26
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
   
 #FIXME assumes multiple possbile submissions but only one is possible currently  #FIXME LATER assumes multiple possible submissions but only one is possible 
   #currently
   
 package Apache::imageresponse;  package Apache::imageresponse;
 use strict;  use strict;
Line 50  sub start_imageresponse { Line 51  sub start_imageresponse {
 }  }
   
 sub end_imageresponse {  sub end_imageresponse {
   &Apache::response::end_response;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   pop @Apache::lonxml::namespace;      &Apache::response::end_response;
   &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));      pop @Apache::lonxml::namespace;
   return '';      &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
       my $result;
       if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
       return $result;
 }  }
   
 %Apache::response::foilgroup=();  %Apache::response::foilgroup=();
Line 96  sub whichfoils { Line 100  sub whichfoils {
 }  }
   
 sub displayfoils {  sub displayfoils {
   my (@whichopt) = @_;    my ($target,@whichopt) = @_;
   my $result ='';    my $result ='';
   my $name;    my $name;
   my $temp=1;    my $temp=1;
   foreach $name (@whichopt) {    foreach $name (@whichopt) {
     $result.=$Apache::response::foilgroup{"$name.text"}."<br />\n";      $result.=$Apache::response::foilgroup{"$name.text"};
       &Apache::lonxml::debug("Text is $result");
       if ($target eq 'tex') {$result.="\\vskip 0 mm \n";} else {$result.="<br />\n";}
     my $image=$Apache::response::foilgroup{"$name.image"};      my $image=$Apache::response::foilgroup{"$name.image"};
       &Apache::lonxml::debug("image is $image");
     if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {      if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
       $result.="<img src=\"$image\"/> <br />\n";        if ($target eq 'tex') {
    $result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n";
         } else {
           $result.="<img src=\"$image\"/> <br />\n";
         }
     } else {      } else {
       $result.="<input type=\"image\" name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\" src=\"$image\"/> <br />\n";        if ($target eq 'tex') {
    $result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n";
         } else {
           $result.="<input type=\"image\" name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\" src=\"$image\"/> <br />\n";
         }
     }      }
     $temp++;      $temp++;
   }    }
Line 124  sub gradefoils { Line 139  sub gradefoils {
     $x=$ENV{"form.HWVAL_$id:$temp.x"};      $x=$ENV{"form.HWVAL_$id:$temp.x"};
     $y=$ENV{"form.HWVAL_$id:$temp.y"};      $y=$ENV{"form.HWVAL_$id:$temp.y"};
     &Apache::lonxml::debug("Got a x of $x and a y of $y for $name");      &Apache::lonxml::debug("Got a x of $x and a y of $y for $name");
     if (defined(@{ $Apache::response::foilgroup{"$name.area"} })) {      if (defined($x) && defined($y) &&
    defined(@{ $Apache::response::foilgroup{"$name.area"} })) {
       my @areas = @{ $Apache::response::foilgroup{"$name.area"} };        my @areas = @{ $Apache::response::foilgroup{"$name.area"} };
       my $grade="INCORRECT";        my $grade="INCORRECT";
       foreach my $area (@areas) {        foreach my $area (@areas) {
Line 155  sub end_foilgroup { Line 171  sub end_foilgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';    my $result='';
   my @whichopt;    my @whichopt;
   if ($target eq 'web' || $target eq 'grade') {    if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') {
     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");
     @whichopt = &whichfoils($max);      @whichopt = &whichfoils($max);
   }      if ($target eq 'web' || $target eq 'tex') {
   if ($target eq 'web') {   $result=&displayfoils($target,@whichopt);
     $result=&displayfoils(@whichopt);      } elsif ($target eq 'grade') {
   }   if ( defined $ENV{'form.submitted'}) { &gradefoils(@whichopt); }
   if ($target eq 'grade') {      } 
     if ( defined $ENV{'form.submitted'}) {    } elsif ($target eq 'edit') {
       &gradefoils(@whichopt);        $result=&Apache::edit::end_table();
     }  
   }    }
   return $result;    return $result;
 }  }
Line 180  sub start_conceptgroup { Line 195  sub start_conceptgroup {
   
 sub end_conceptgroup {  sub end_conceptgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   $Apache::imageresponse::conceptgroup=0;      $Apache::imageresponse::conceptgroup=0;
   if ($target eq 'web' || $target eq 'grade') {    my $result;
     if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') {
     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(&Math::Random::random_uniform() * ($#names+1));        my $pick=int(&Math::Random::random_uniform() * ($#names+1));
Line 196  sub end_conceptgroup { Line 212  sub end_conceptgroup {
  &Apache::lonxml::debug("Selecting $name in $concept");   &Apache::lonxml::debug("Selecting $name in $concept");
       }        }
     }      }
     } elsif ($target eq 'edit') {
         $result=&Apache::edit::end_table();
   }    }
   return '';    return $result;
   }
   
   sub insert_foil {
       return '
          <foil>
              <image></image>
              <text></text>
              <rectangle></rectangle>
          </foil>
   ';
 }  }
   
 $Apache::imageresponse::curname='';  $Apache::imageresponse::curname='';
 sub start_foil {  sub start_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web' || $target eq 'grade') {    if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') {
     my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);      my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
     if ($name eq '') { $name=$Apache::lonxml::curdepth; }      if ($name eq '') { $name=$Apache::lonxml::curdepth; }
     if ( $Apache::imageresponse::conceptgroup      if ( $Apache::imageresponse::conceptgroup
Line 218  sub start_foil { Line 246  sub start_foil {
 }  }
   
 sub end_foil {  sub end_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   return '';      my $result;
       if ($target eq 'edit') {
    $result=&Apache::edit::end_table();
       }
       return $result;
 }  }
   
 sub start_text {  sub start_text {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web') { &Apache::lonxml::startredirection; }    my $result='';
   return '';    if ($target eq 'web' || $target eq 'tex') { 
        &Apache::lonxml::startredirection; 
     } elsif ($target eq 'edit') {
       my $descr=&Apache::lonxml::get_all_text('/text',$parser);
       $result=&Apache::edit::tag_start($target,$token,'Task Description').
    &Apache::edit::editfield($token->[1],$descr,'Text',60,2).
           &Apache::edit::end_row();
     } elsif ($target eq "modified") {
       my $descr=&Apache::lonxml::get_all_text('/text',$parser);
       $result=$token->[4].&Apache::edit::modifiedfield($token);
       &Apache::lonxml::debug($result);
     }
     return $result;
 }  }
   
 sub end_text {  sub end_text {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web') {    my $result;
     if ($target eq 'web' || $target eq 'tex') {
     my $name = $Apache::imageresponse::curname;      my $name = $Apache::imageresponse::curname;
     if ( $Apache::imageresponse::conceptgroup      if ( $Apache::imageresponse::conceptgroup
        && !&Apache::response::showallfoils() ) {         && !&Apache::response::showallfoils() ) {
Line 238  sub end_text { Line 283  sub end_text {
     } else {      } else {
       $Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection;        $Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection;
     }      }
     } elsif ($target eq 'edit') {
         $result=&Apache::edit::end_table();
   }    }
   return '';    return $result;
 }  }
   
 sub start_image {  sub start_image {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web' || $target eq 'tex') { &Apache::lonxml::startredirection; }    my $result='';
   return '';    if ($target eq 'web' || $target eq 'tex') { 
         &Apache::lonxml::startredirection; 
     } elsif ($target eq 'edit') {
       my $bgimg=&Apache::lonxml::get_all_text('/image',$parser);
       $Apache::edit::bgimgsrc=$bgimg;
       $Apache::edit::bgimgsrcdepth=$Apache::lonxml::curdepth;
   
       $result=&Apache::edit::tag_start($target,$token,'Clickable Image').
    &Apache::edit::editline($token->[1],$bgimg,'Image Source File',40);
       $result.=&Apache::edit::browse(undef,'textnode').' ';
       $result.=&Apache::edit::search(undef,'textnode').
           &Apache::edit::end_row();
     } elsif ($target eq "modified") {
       my $bgimg=&Apache::lonxml::get_all_text('/image',$parser);
       $result=$token->[4].&Apache::edit::modifiedfield($token);
       &Apache::lonxml::debug($result);
     }
     return $result;
 }  }
   
 sub end_image {  sub end_image {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;                my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $currentstring = '';    my $result;
     my $name = $Apache::imageresponse::curname;
   if ($target eq 'web') {    if ($target eq 'web') {
     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");
     if ( $Apache::imageresponse::conceptgroup      if ( $Apache::imageresponse::conceptgroup
Line 261  sub end_image { Line 325  sub end_image {
     } else {      } else {
       $Apache::response::foilgroup{"$name.image"} = $image;        $Apache::response::foilgroup{"$name.image"} = $image;
     }      }
     } elsif ($target eq 'edit') {
         $result=&Apache::edit::end_table();
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
     my $src = &Apache::lonxml::endredirection;      my $src = &Apache::lonxml::endredirection;
     $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
Line 308  sub end_image { Line 374  sub end_image {
  $path = $1.'/';    $path = $1.'/'; 
     }      }
     my $newsrc = $src;      my $newsrc = $src;
     $newsrc =~ s/(\.gif|\.jpg)$/\.eps/i;      $newsrc =~ s/(\.gif|\.jpg|\.jpeg)$/\.eps/i;
     $file=~s/(\.gif|\.jpg)$/\.eps/i;      $file=~s/(\.gif|\.jpg|\.jpeg)$/\.eps/i;
     #do we have any specified size of the picture?      #do we have any specified size of the picture?
     my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval);       my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval); 
     my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval);       my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval); 
Line 324  sub end_image { Line 390  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.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';    $Apache::response::foilgroup{"$name.image"} ='\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/}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';  $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \graphicspath{{/home/httpd/prtspool/}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
     }      }
  }     } 
   return $currentstring;    return $result;
 }  }
   
 sub start_rectangle {  sub start_rectangle {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web' || $target eq 'grade') { &Apache::lonxml::startredirection; }    my $result='';
   return '';    if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { 
        &Apache::lonxml::startredirection; 
     } elsif ($target eq 'edit') {
       my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser);
       $result=&Apache::edit::tag_start($target,$token,'Rectangle').
    &Apache::edit::editline($token->[1],$coords,'Coordinate Pairs',40).
           &Apache::edit::entercoordpair(undef,'textnode').
           &Apache::edit::end_row();
     } elsif ($target eq "modified") {
       my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser);
       $result=$token->[4].&Apache::edit::modifiedfield($token);
       &Apache::lonxml::debug($result);
     }
     return $result;
 }  }
   
 sub grade_rectangle {  sub grade_rectangle {
Line 362  sub grade_rectangle { Line 441  sub grade_rectangle {
   
 sub end_rectangle {  sub end_rectangle {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web' || $target eq 'grade') {    my $result;
     if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') {
     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");
Line 372  sub end_rectangle { Line 452  sub end_rectangle {
     } else {      } else {
       push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area";        push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area";
     }      }
     } elsif ($target eq 'edit') {
         $result=&Apache::edit::end_table();
   }    }
   return '';    return $result;
 }  }
 1;  1;
 __END__  __END__
Removed from v.1.23  
changed lines
  Added in v.1.31

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