--- loncom/homework/imagechoice.pm 2006/04/13 18:49:29 1.10
+++ loncom/homework/imagechoice.pm 2008/03/12 02:46:53 1.14
@@ -1,4 +1,4 @@
-# $Id: imagechoice.pm,v 1.10 2006/04/13 18:49:29 albertel Exp $
+# $Id: imagechoice.pm,v 1.14 2008/03/12 02:46:53 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,6 +26,8 @@ package Apache::imagechoice;
use strict;
use Apache::Constants qw(:common :http);
use Apache::lonnet;
+use LONCAPA;
+
sub deletedata {
my ($id)=@_;
@@ -56,7 +58,7 @@ ENDSUBM
my $end_page =
&Apache::loncommon::end_page();
- my $js=<<"ENDSUBM";
+ $r->print(<<"ENDSUBM");
$start_page
Position Selected
$display
@@ -122,14 +124,14 @@ sub getcoord {
$heading='Select Second Coordinate on Image';
#$nextstage='';
} else {
- $heading='Select Finish to store selection.';
+ $heading='Select Finish to save selection.';
$nextstage='';
}
} elsif ($type eq 'polygon') {
$heading='Enter Coordinate or click finish to close Polygon';
$nextstage='';
} elsif ($type eq 'point') {
- $heading='Click to select a Coordinate or click Finish to store current selection.';
+ $heading='Click to select a Coordinate or click Finish to save current selection.';
$nextstage='';
}
@@ -163,7 +165,7 @@ sub savecoord {
$data=join(':',($env{"imagechoice.$id.coords"},
$env{"form.image.x"},$env{"form.image.y"}));
}
- &Apache::lonnet::appenv("imagechoice.$id.coords"=>$data);
+ &Apache::lonnet::appenv({"imagechoice.$id.coords"=>$data});
}
return int(scalar(split(':',$env{"imagechoice.$id.coords"}))/2);
}
@@ -235,7 +237,7 @@ sub drawimage {
&drawX(\%data,$imid,$x,$y);
if ($type eq "polygon") { &drawPolygon(\%data,$id,$imid); }
if ($type eq "box") { &drawBox(\%data,$id,$imid); }
- &Apache::lonnet::appenv(%data);
+ &Apache::lonnet::appenv(\%data);
return "/adm/randomlabel.png?token=$imid"
}
@@ -245,7 +247,7 @@ sub handler {
$r->send_http_header;
my %data;
my (undef,$id) = split(/=/,$ENV{'QUERY_STRING'});
- my $filename = &Apache::lonnet::unescape($env{"imagechoice.$id.file"});
+ my $filename = &unescape($env{"imagechoice.$id.file"});
my $formname = $env{"imagechoice.$id.formname"};
if ($env{'form.cancel'} eq 'Cancel') {
&deletedata($id);