loncom/homework/imageresponse.pm - diff

Return to imageresponse.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/imageresponse.pm between versions 1.94.2.1 and 1.95

-version 1.94.2.1, 2008/12/21 05:22:01
+version 1.95, 2008/11/12 20:01:21
  Line 29
  #FIXME LATER assumes multiple possible submissions but only one is possible
  #currently
+ =head1 NAME
+ Apache::imageresponse
+ =head1 SYNOPSIS
+ Coordinates the response to clicking an image.
+ This is part of the LearningOnline Network with CAPA project
+ described at http://www.lon-capa.org.
+ =head1 HANDLER SUBROUTINE
+ =head1 OTHER SUBROUTINES
+ =over
+ =item *
+ start_imageresponse()
+ =item *
+ end_imageresponse()
+ =item *
+ start_foilgroup()
+ =item *
+ getfoilcounts()
+ =item *
+ whichfoils()
+ =item *
+ prep_image()
+ =item *
+ draw_image()
+ =item *
+ displayfoils()
+ =item *
+ format_prior_response()
+ =item *
+ display_answers()
+ =item *
+ clean_up_image()
+ =item *
+ gradefoils()
+ =item *
+ stringify_submission()
+ =item *
+ get_submission()
+ =item *
+ end_foilgroup()
+ =item *
+ start_conceptgroup()
+ =item *
+ end_conceptgroup()
+ =item *
+ insert_foil()
+ =item *
+ start_foil()
+ =item *
+ end_foil()
+ =item *
+ start_text()
+ =item *
+ end_text()
+ =item *
+ start_image()
+ =item *
+ end_image()
+ =item *
+ start_rectangle()
+ =item *
+ grade_rectangle()
+ =item *
+ end_rectangle()
+ =item *
+ start_polygon()
+ =item *
+ grade_polygon()
+ =item *
+ end_polygon()
+ =back
+ =cut
  package Apache::imageresponse;
  use strict;
  use Image::Magick();
- Line 239  sub displayfoils {
+ Line 385  sub displayfoils {
  	my $image=$Apache::response::foilgroup{"$name.image"};
  	&Apache::lonxml::debug("image is $image");
  	if ( ($target eq 'web' || $target eq 'answer')
- 	     && $image !~ /^https?\:/ ) {
+ 	     && $image !~ /^http:/ ) {
  	    $image=&clean_up_image($image);
  	}
  	push(@images,$image);
- Line 305  sub display_answers {
+ Line 451  sub display_answers {
  	my $image=$Apache::response::foilgroup{"$name.image"};
  	&Apache::lonxml::debug("image is $image");
  	if ( ($target eq 'web' || $target eq 'answer')
- 	     && $image !~ /^https?\:/ ) {
+ 	     && $image !~ /^http:/ ) {
  	    $image = &clean_up_image($image);
  	}
  	my $token=&prep_image($image,'answeronly',$name);
- Line 320  sub clean_up_image {
+ Line 466  sub clean_up_image {
      my ($image)=@_;
      if ($image =~ /\s*<img\s*/) {
  	($image) = ($image =~ /src\s*=\s*[\"\']([^\"\']+)[\"\']/i);
- 	if ($image !~ /^https?\:/) {
+ 	if ($image !~ /^http:/) {
  	    $image=&Apache::lonnet::hreflocation('',$image);
  	}
  	if (!$image) {

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

Removed from v.1.94.2.1
changed lines
	Added in v.1.95