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.95 and 1.97

-version 1.95, 2008/11/12 20:01:21
+version 1.97, 2008/12/19 14:28:14
  Line 41  Coordinates the response to clicking an
  This is part of the LearningOnline Network with CAPA project
  described at http://www.lon-capa.org.
- =head1 HANDLER SUBROUTINE
+ =head1 SUBROUTINES
- =head1 OTHER SUBROUTINES
  =over
- =item *
+ =item start_imageresponse()
- 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 *
+ =item end_imageresponse()
- end_conceptgroup()
+ =item start_foilgroup()
- =item *
+ =item getfoilcounts()
- insert_foil()
+ =item whichfoils()
- =item *
+ =item prep_image()
- start_foil()
+ =item draw_image()
- =item *
+ =item displayfoils()
- end_foil()
+ =item format_prior_response()
- =item *
+ =item display_answers()
- start_text()
+ =item clean_up_image()
- =item *
+ =item gradefoils()
- end_text()
+ =item stringify_submission()
- =item *
+ =item get_submission()
- start_image()
+ =item end_foilgroup()
+ =item start_conceptgroup()
- =item *
+ =item end_conceptgroup()
- end_image()
+ =item insert_foil()
- =item *
+ =item start_foil()
- start_rectangle()
+ =item end_foil()
- =item *
+ =item start_text()
- grade_rectangle()
+ =item end_text()
- =item *
+ =item start_image()
- end_rectangle()
+ =item end_image()
- =item *
+ =item start_rectangle()
- start_polygon()
+ =item grade_rectangle()
- =item *
+ =item end_rectangle()
- grade_polygon()
+ =item start_polygon()
- =item *
+ =item grade_polygon()
- end_polygon()
+ =item end_polygon()
  =back
- Line 385  sub displayfoils {
+ Line 320  sub displayfoils {
  	my $image=$Apache::response::foilgroup{"$name.image"};
  	&Apache::lonxml::debug("image is $image");
  	if ( ($target eq 'web' || $target eq 'answer')
- 	     && $image !~ /^http:/ ) {
+ 	     && $image !~ /^https?\:/ ) {
  	    $image=&clean_up_image($image);
  	}
  	push(@images,$image);
- Line 451  sub display_answers {
+ Line 386  sub display_answers {
  	my $image=$Apache::response::foilgroup{"$name.image"};
  	&Apache::lonxml::debug("image is $image");
  	if ( ($target eq 'web' || $target eq 'answer')
- 	     && $image !~ /^http:/ ) {
+ 	     && $image !~ /^https?\:/ ) {
  	    $image = &clean_up_image($image);
  	}
  	my $token=&prep_image($image,'answeronly',$name);
- Line 466  sub clean_up_image {
+ Line 401  sub clean_up_image {
      my ($image)=@_;
      if ($image =~ /\s*<img\s*/) {
  	($image) = ($image =~ /src\s*=\s*[\"\']([^\"\']+)[\"\']/i);
- 	if ($image !~ /^http:/) {
+ 	if ($image !~ /^https?\:/) {
  	    $image=&Apache::lonnet::hreflocation('',$image);
  	}
  	if (!$image) {

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

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