[LON-CAPA-cvs] cvs: loncom /homework edit.pm

[albertel]

albertel		Tue Feb 17 17:02:43 2004 EDT

  Modified files:              
    /loncom/homework	edit.pm 
  Log:
  - BUG#2710 <randomlabel> uses imagechoice.pm for coordinate entry
  
  
Index: loncom/homework/edit.pm
diff -u loncom/homework/edit.pm:1.79 loncom/homework/edit.pm:1.80
--- loncom/homework/edit.pm:1.79	Fri Feb 13 16:12:54 2004
+++ loncom/homework/edit.pm	Tue Feb 17 17:02:43 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.79 2004/02/13 21:12:54 albertel Exp $
+# $Id: edit.pm,v 1.80 2004/02/17 22:02:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -703,11 +703,11 @@
 #----------------------------------------------------- image coordinates
 # single image coordinates, x, y 
 sub entercoords {
-    my ($idx,,$idy,$mode,$width,$height) = @_;
+    my ($idx,$idy,$mode,$width,$height) = @_;
     unless ($Apache::edit::bgimgsrc) { return ''; }
     if ($idx) { $idx.='_'; }
     if ($idy) { $idy.='_'; }
-    my $bgfile=&Apache::lonnet::escape($Apache::edit::bgimgsrc);
+    my $bgfile=&Apache::lonnet::escape(&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$Apache::edit::bgimgsrc));
     my $form    = 'lonhomework';
     my $element;
     if (! defined($mode) || $mode eq 'attribute') {
@@ -716,18 +716,24 @@
         $element = &Apache::lonnet::escape('homework_edit_'.
                                            $Apache::lonxml::curdepth);
     }
-    my $formheight='';
+    my $id=$Apache::lonxml::curdepth;
+    my %data=("imagechoice.$id.type"      =>'point',
+	      "imagechoice.$id.formname"  =>$form,
+	      "imagechoice.$id.formx"     =>"$idx$element",
+	      "imagechoice.$id.formy"     =>"$idy$element",
+	      "imagechoice.$id.file"      =>$bgfile,
+	      "imagechoice.$id.formcoord" =>$element);
     if ($height) {
-	$formheight='&formheight='.$height.'_'.$Apache::edit::bgimgsrccurdepth;
+	$data{"imagechoice.$id.formheight"}=$height.'_'.
+	    $Apache::edit::bgimgsrccurdepth;
     }
-    my $formwidth='';
     if ($width) {
-	$formwidth='&formwidth='.$width.'_'.$Apache::edit::bgimgsrccurdepth;
+	$data{"imagechoice.$id.formwidth"}=$width.'_'.
+	    $Apache::edit::bgimgsrccurdepth;
     }
-    my $result = <<"ENDBUTTON";
-<a href="/cgi-bin/imagechoice.pl?formname=$form&file=$bgfile&formx=$idx$element&formy=$idy$element$formheight$formwidth"
-target="imagechoice">Click Coordinates</a>
-ENDBUTTON
+    &Apache::lonnet::appenv(%data);
+    my $text="Click Coordinates";
+    my $result='<a href="/adm/imagechoice?token='.$id.'" target="imagechoice">'.$text.'</a>';
     return $result;
 }
 
@@ -737,7 +743,6 @@
     my ($idx,$mode,$width,$height,$type) = @_;
     unless ($Apache::edit::bgimgsrc) { return ''; }
     my $bgfile=&Apache::lonnet::escape(&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$Apache::edit::bgimgsrc));
-    &Apache::lonnet::logthis($Apache::edit::bgfile);
     my $form    = 'lonhomework';
     my $element;
     if (! defined($mode) || $mode eq 'attribute') {