--- loncom/homework/imagechoice.pm 2004/01/09 23:22:19 1.1 +++ loncom/homework/imagechoice.pm 2004/01/12 19:53:54 1.2 @@ -1,4 +1,4 @@ -# $Id: imagechoice.pm,v 1.1 2004/01/09 23:22:19 albertel Exp $ +# $Id: imagechoice.pm,v 1.2 2004/01/12 19:53:54 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,10 +26,11 @@ package Apache::imagechoice; use strict; use Apache::Constants qw(:common :http); -# -# Single coordinate, defined - store it -# +sub deletedata { + my ($id)=@_; + &Apache::lonnet::delenv("imagechoice\\.$id"); +} sub closewindow { my ($r,$output,$filename)=@_; @@ -43,7 +44,7 @@ sub closewindow {

Position Selected

- + ENDSUBM @@ -52,34 +53,34 @@ ENDSUBM sub storedata { my ($r,$mode,$filename,$id)=@_; - my (undef,@coords)=split(':',$ENV{"cgi.$id.coords"}); + my (undef,@coords)=split(':',$ENV{"imagechoice.$id.coords"}); my $output; - if ($ENV{"cgi.$id.formwidth"}) { - $output.='opener.document.forms.'.$ENV{"cgi.$id.formname"}.'.'.$ENV{"cgi.$id.formwidth"}.'.value=document.pickimg.width;'; + if ($ENV{"imagechoice.$id.formwidth"}) { + $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formwidth"}.'.value=document.pickimg.width;'; } - if ($ENV{"cgi.$id.formheight"}) { - $output.='opener.document.forms.'.$ENV{"cgi.$id.formname"}.'.'.$ENV{"cgi.$id.formheight"}.'.value=document.pickimg.height;'; + if ($ENV{"imagechoice.$id.formheight"}) { + $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formheight"}.'.value=document.pickimg.height;'; } - if ((defined($ENV{"cgi.$id.x"})) && (defined($ENV{"cgi.$id.y"})) && + if ((defined($ENV{"imagechoice.$id.x"})) && (defined($ENV{"imagechoice.$id.y"})) && ($mode ne 'pairtwo') && ($mode ne 'pairthree')) { my $output=''; - if ($ENV{"cgi.$id.formx"}) { - $output.='opener.document.forms.'.$ENV{"cgi.$id.formname"}.'.'.$ENV{"cgi.$id.formx"}. - '.value='.$ENV{"cgi.$id.x"}.';'; + if ($ENV{"imagechoice.$id.formx"}) { + $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formx"}. + '.value='.$ENV{"imagechoice.$id.x"}.';'; } - if ($ENV{"cgi.$id.formy"}) { - $output.='opener.document.forms.'.$ENV{"cgi.$id.formname"}.'.'.$ENV{"cgi.$id.formy"}. - '.value='.$ENV{"cgi.$id.y"}.';'; + if ($ENV{"imagechoice.$id.formy"}) { + $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formy"}. + '.value='.$ENV{"imagechoice.$id.y"}.';'; } } elsif ($mode eq 'pairthree') { my $output=''; - my $outputpair='('.$ENV{"cgi.$id.selx"}.','.$ENV{"cgi.$id.sely"}.')-('.$ENV{"cgi.$id.x"}.','.$ENV{"cgi.$id.y"}.')'; + my $outputpair='('.$ENV{"imagechoice.$id.selx"}.','.$ENV{"imagechoice.$id.sely"}.')-('.$ENV{"imagechoice.$id.x"}.','.$ENV{"imagechoice.$id.y"}.')'; - if ($ENV{"cgi.$id.formcoord"}) { - $output.='opener.document.forms.'.$ENV{"cgi.$id.formname"}.'.'.$ENV{"cgi.$id.formcoord"}. + if ($ENV{"imagechoice.$id.formcoord"}) { + $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formcoord"}. '.value="'.$outputpair.'";'; } } elsif ($mode eq 'polygon') { @@ -88,8 +89,9 @@ sub storedata { $coordstr.='('.shift(@coords).','.shift(@coords).')-'; } chop($coordstr); - $output.='opener.document.forms.'.$ENV{"cgi.$id.formname"}.'.'.$ENV{"cgi.$id.formcoord"}.'.value="'.$coordstr.'";'; + $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formcoord"}.'.value="'.$coordstr.'";'; } + &deletedata($id); &closewindow($r,$output,$filename); } @@ -113,6 +115,8 @@ sub getcoord {

Select $heading on Image

$nextstage + +
@@ -123,9 +127,9 @@ END sub savecoord { my ($id)=@_; if (defined($ENV{"form.image.x"}) && defined($ENV{"form.image.y"})) { - my $data=join(':',($ENV{"cgi.$id.coords"},$ENV{"form.image.x"}, + my $data=join(':',($ENV{"imagechoice.$id.coords"},$ENV{"form.image.x"}, $ENV{"form.image.y"})); - &Apache::lonnet::appenv("cgi.$id.coords"=>$data); + &Apache::lonnet::appenv("imagechoice.$id.coords"=>$data); } } @@ -153,7 +157,7 @@ sub drawX { sub drawPolygon { my ($id,$imid)=@_; - my (undef,@coords)=split(':',$ENV{"cgi.$id.coords"}); + my (undef,@coords)=split(':',$ENV{"imagechoice.$id.coords"}); my $coordstr; while (@coords) { $coordstr.='('.shift(@coords).','.shift(@coords).')-'; @@ -174,9 +178,8 @@ sub drawPolygon { sub drawimage { my ($r,$mode,$filename,$id)=@_; my $imid=&Apache::loncommon::get_cgi_id(); - my (undef,@coords)=split(':',$ENV{"cgi.$id.coords"}); - if (scalar(@coords) < 2) { return $filename; } - $filename=&Apache::lonnet::filelocation('',$filename); + my (undef,@coords)=split(':',$ENV{"imagechoice.$id.coords"}); + if (scalar(@coords) < 2) { return &Apache::lonnet::hreflocation('',$filename); } my %data; $data{"cgi.$imid.BGIMG"}=$filename; my $x=@coords[-2]; @@ -192,10 +195,13 @@ sub handler { $r->content_type('text/html'); my %data; my (undef,$id) = split(/=/,$ENV{'QUERY_STRING'}); - my $filename = $ENV{"cgi.$id.file"}; - my $formname = $ENV{"cgi.$id.formname"}; - my $mode=$ENV{"cgi.$id.mode"}; - $filename=&Apache::lonnet::unescape($filename); + my $filename = &Apache::lonnet::unescape($ENV{"imagechoice.$id.file"}); + my $formname = $ENV{"imagechoice.$id.formname"}; + my $mode=$ENV{"imagechoice.$id.mode"}; + if ($ENV{'form.cancel'} eq 'Cancel') { + &deletedata($id); + &closewindow($r,'',$filename); + } &savecoord($id); my $imurl=&drawimage($r,$mode,$filename,$id); if ($ENV{'form.finish'} eq 'Finish') {