--- loncom/homework/imagechoice.pm	2006/05/30 12:45:37	1.11
+++ loncom/homework/imagechoice.pm	2008/03/12 02:46:53	1.14
@@ -1,4 +1,4 @@
-# $Id: imagechoice.pm,v 1.11 2006/05/30 12:45:37 www Exp $
+# $Id: imagechoice.pm,v 1.14 2008/03/12 02:46:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,7 +26,6 @@ package Apache::imagechoice;
 use strict;
 use Apache::Constants qw(:common :http);
 use Apache::lonnet;
-use lib '/home/httpd/lib/perl/';
 use LONCAPA;
  
 
@@ -59,7 +58,7 @@ ENDSUBM
     my $end_page =
         &Apache::loncommon::end_page();
 
-    my $js=<<"ENDSUBM";
+    $r->print(<<"ENDSUBM");
 $start_page
 <h3>Position Selected</h3>
 $display
@@ -125,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" />';
     }
 
@@ -166,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);
 }
@@ -238,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"
 }