--- loncom/homework/imagechoice.pm	2006/04/13 18:49:29	1.10
+++ loncom/homework/imagechoice.pm	2007/05/02 01:33:02	1.13
@@ -1,4 +1,4 @@
-# $Id: imagechoice.pm,v 1.10 2006/04/13 18:49:29 albertel Exp $
+# $Id: imagechoice.pm,v 1.13 2007/05/02 01:33:02 albertel 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
 <h3>Position Selected</h3>
 $display
@@ -122,14 +124,14 @@ sub getcoord {
 	    $heading='Select Second Coordinate on Image';
 	    #$nextstage='<input type="hidden" name="type" value="pairthree" />';
 	} else {
-	    $heading='Select Finish to store selection.';
+	    $heading='Select Finish to save selection.';
 	    $nextstage='<input type="submit" name="finish" value="Finish" />';
 	}
     } elsif ($type eq 'polygon') {
 	$heading='Enter Coordinate or click finish to close Polygon';
 	$nextstage='<input type="submit" name="finish" value="Finish" />';
     } 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='<input type="submit" name="finish" value="Finish" />';
     }
 
@@ -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);