--- loncom/homework/imagechoice.pm 2004/02/24 00:14:01 1.5
+++ loncom/homework/imagechoice.pm 2006/05/30 12:45:37 1.11
@@ -1,4 +1,4 @@
-# $Id: imagechoice.pm,v 1.5 2004/02/24 00:14:01 albertel Exp $
+# $Id: imagechoice.pm,v 1.11 2006/05/30 12:45:37 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,7 +25,10 @@
package Apache::imagechoice;
use strict;
use Apache::Constants qw(:common :http);
-
+use Apache::lonnet;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+
sub deletedata {
my ($id)=@_;
@@ -33,49 +36,64 @@ sub deletedata {
}
sub closewindow {
- my ($r,$output,$filename,$needimage)=@_;
+ my ($r,$output,$filename,$needimage,$display)=@_;
if ($needimage) {
$needimage="<img name=\"pickimg\" src=\"$filename\" />";
}
- $r->print(<<"ENDSUBM");
-<html>
-<script>
+ my $js=<<"ENDSUBM";
+<script type="text/javascript">
function submitthis() {
$output
self.close();
}
</script>
-<body bgcolor="#FFFFFF" onLoad="submitthis()">
+ENDSUBM
+
+ my $start_page =
+ &Apache::loncommon::start_page('Close Window',$js,
+ {'bgcolor' => '#FFFFFF',
+ 'only_body' => 1,
+ 'add_entries' => {
+ onload => 'submitthis();'},});
+
+ my $end_page =
+ &Apache::loncommon::end_page();
+
+ my $js=<<"ENDSUBM";
+$start_page
<h3>Position Selected</h3>
+$display
$needimage
-</body>
-</html>
+$end_page
ENDSUBM
}
sub storedata {
my ($r,$type,$filename,$id)=@_;
- my (undef,@coords)=split(':',$ENV{"imagechoice.$id.coords"});
+ my (undef,@coords)=split(':',$env{"imagechoice.$id.coords"});
my ($output,$needimage);
- if ($ENV{"imagechoice.$id.formwidth"}) {
- $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$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;';
$needimage=1;
}
- if ($ENV{"imagechoice.$id.formheight"}) {
- $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$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;';
$needimage=1;
}
+ my $display;
if ($type eq 'point') {
- my (undef,$x,$y)=split(':',$ENV{"imagechoice.$id.coords"});
- if ($ENV{"imagechoice.$id.formx"}) {
- $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formx"}.'.value='.$x.';';
+ my (undef,$x,$y)=split(':',$env{"imagechoice.$id.coords"});
+ if ($env{"imagechoice.$id.formx"}) {
+ $output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formx"}.'.value='.$x.';';
+ $display.="<p>The X coordinate is $x</p>\n";
}
- if ($ENV{"imagechoice.$id.formy"}) {
- $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formy"}.'.value='.$y.';';
+ if ($env{"imagechoice.$id.formy"}) {
+ $output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formy"}.'.value='.$y.';';
+ $display.="<p>The Y coordinate is $y</p>\n";
}
} elsif ($type eq 'polygon' or $type eq 'box') {
my $coordstr;
@@ -83,11 +101,14 @@ sub storedata {
$coordstr.='('.shift(@coords).','.shift(@coords).')-';
}
chop($coordstr);
- $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formcoord"}.'.value="'.$coordstr.'";';
+ $display.="<p>The selected coordinates are <tt>$coordstr</tt></p>\n";
+ $output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formcoord"}.'.value="'.$coordstr.'";';
+ }
+ if ($display) {
+ $display.="<p>If this window fails to close you may need to manually replace the old coordinates with the above value.</p>\n";
}
-
&deletedata($id);
- &closewindow($r,$output,$filename,$needimage);
+ &closewindow($r,$output,$filename,$needimage,$display);
}
sub getcoord {
@@ -95,7 +116,7 @@ sub getcoord {
my $heading='Select Position on Image';
my $nextstage='';
if ($type eq 'box') {
- my (undef,@coords)=split(':',$ENV{"imagechoice.$id.coords"});
+ my (undef,@coords)=split(':',$env{"imagechoice.$id.coords"});
my $step=scalar(@coords)/2;
if ($step == 0) {
$heading='Select First Coordinate on Image';
@@ -114,9 +135,16 @@ sub getcoord {
$heading='Click to select a Coordinate or click Finish to store current selection.';
$nextstage='<input type="submit" name="finish" value="Finish" />';
}
+
+ my $start_page =
+ &Apache::loncommon::start_page('Get Coordinates',undef,
+ {'bgcolor' => '#FFFFFF',
+ 'only_body' => 1,});
+
+ my $end_page =
+ &Apache::loncommon::end_page();
$r->print(<<"END");
-<html>
-<body bgcolor="#FFFFFF">
+$start_page
<h3>$heading</h3>
<form method="POST" action="/adm/imagechoice?token=$id">
$nextstage
@@ -124,24 +152,23 @@ $nextstage
<br />
<input name="image" type="image" src="$filename" />
</form>
-</body>
-</html>
+$end_page
END
}
sub savecoord {
my ($id,$type)=@_;
- if (defined($ENV{"form.image.x"}) && defined($ENV{"form.image.y"})) {
+ if (defined($env{"form.image.x"}) && defined($env{"form.image.y"})) {
my $data;
if ($type eq 'point') {
- $data=join(':',(undef,$ENV{"form.image.x"},$ENV{"form.image.y"}));
+ $data=join(':',(undef,$env{"form.image.x"},$env{"form.image.y"}));
} else {
- $data=join(':',($ENV{"imagechoice.$id.coords"},
- $ENV{"form.image.x"},$ENV{"form.image.y"}));
+ $data=join(':',($env{"imagechoice.$id.coords"},
+ $env{"form.image.x"},$env{"form.image.y"}));
}
&Apache::lonnet::appenv("imagechoice.$id.coords"=>$data);
}
- return int(scalar(split(':',$ENV{"imagechoice.$id.coords"}))/2);
+ return int(scalar(split(':',$env{"imagechoice.$id.coords"}))/2);
}
sub add_obj {
@@ -174,7 +201,7 @@ sub drawX {
sub drawPolygon {
my ($data,$id,$imid)=@_;
- my (undef,@coords)=split(':',$ENV{"imagechoice.$id.coords"});
+ my (undef,@coords)=split(':',$env{"imagechoice.$id.coords"});
my $coordstr;
while (@coords) {
$coordstr.='('.shift(@coords).','.shift(@coords).')-';
@@ -190,7 +217,7 @@ sub drawPolygon {
sub drawBox {
my ($data,$id,$imid)=@_;
- my (undef,@coords)=split(':',$ENV{"imagechoice.$id.coords"});
+ my (undef,@coords)=split(':',$env{"imagechoice.$id.coords"});
if (scalar(@coords) < 4) { return ''; }
my $width = 1;
my $extrawidth = 2;
@@ -202,7 +229,7 @@ sub drawBox {
sub drawimage {
my ($r,$type,$filename,$id)=@_;
my $imid=&Apache::loncommon::get_cgi_id();
- my (undef,@coords)=split(':',$ENV{"imagechoice.$id.coords"});
+ my (undef,@coords)=split(':',$env{"imagechoice.$id.coords"});
if (scalar(@coords) < 2) { return &Apache::lonnet::hreflocation('',$filename); }
my %data;
$data{"cgi.$imid.BGIMG"}=$filename;
@@ -217,22 +244,22 @@ sub drawimage {
sub handler {
my ($r)=@_;
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
my %data;
my (undef,$id) = split(/=/,$ENV{'QUERY_STRING'});
- my $filename = &Apache::lonnet::unescape($ENV{"imagechoice.$id.file"});
- my $formname = $ENV{"imagechoice.$id.formname"};
- if ($ENV{'form.cancel'} eq 'Cancel') {
+ my $filename = &unescape($env{"imagechoice.$id.file"});
+ my $formname = $env{"imagechoice.$id.formname"};
+ if ($env{'form.cancel'} eq 'Cancel') {
&deletedata($id);
&closewindow($r,'',$filename);
return OK;
}
- my $type=$ENV{"imagechoice.$id.type"};
- if (defined($ENV{'form.type'})) { $type=$ENV{'form.type'}; }
+ my $type=$env{"imagechoice.$id.type"};
+ if (defined($env{'form.type'})) { $type=$env{'form.type'}; }
my $numcoords=&savecoord($id,$type);
- &Apache::lonnet::logthis("num coords is $numcoords");
my $imurl=&drawimage($r,$type,$filename,$id);
- if (($ENV{'form.finish'} eq 'Finish')) {
+ if (($env{'form.finish'} eq 'Finish')) {
&storedata($r,$type,$imurl,$id);
} else {
&getcoord($r,$type,$imurl,$id);