--- loncom/homework/imagechoice.pm	2006/04/13 18:49:29	1.10
+++ loncom/homework/imagechoice.pm	2006/07/03 00:03:56	1.12
@@ -1,4 +1,4 @@
-# $Id: imagechoice.pm,v 1.10 2006/04/13 18:49:29 albertel Exp $
+# $Id: imagechoice.pm,v 1.12 2006/07/03 00:03:56 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
@@ -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);