--- loncom/homework/edit.pm	2004/01/12 19:53:54	1.76
+++ loncom/homework/edit.pm	2004/02/17 22:02:43	1.80
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.76 2004/01/12 19:53:54 albertel Exp $
+# $Id: edit.pm,v 1.80 2004/02/17 22:02:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -289,8 +289,7 @@ sub insert_formularesponse {
 <formularesponse answer="" samples="">
     <textline />
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </formularesponse>';
 }
@@ -300,8 +299,7 @@ sub insert_numericalresponse {
 <numericalresponse answer="">
     <textline />
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </numericalresponse>';
 }
@@ -311,8 +309,7 @@ sub insert_stringresponse {
 <stringresponse answer="" type="">
     <textline />
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </stringresponse>';
 }
@@ -330,8 +327,7 @@ sub insert_imageresponse {
     <foilgroup>
     </foilgroup>
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </imageresponse>';
 }
@@ -342,8 +338,7 @@ sub insert_optionresponse {
     <foilgroup options="">
     </foilgroup>
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </optionresponse>';
 }
@@ -353,8 +348,7 @@ sub insert_organicresponse {
 <organicresponse>
     <textline />
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </organicresponse>';
 }
@@ -371,8 +365,7 @@ sub insert_radiobuttonresponse {
     <foilgroup>
     </foilgroup>
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </radiobuttonresponse>';
 }
@@ -382,8 +375,7 @@ sub insert_reactionresponse {
 <reactionresponse>
     <textline />
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </reactionresponse>';
 }
@@ -394,8 +386,7 @@ sub insert_rankresponse {
     <foilgroup options="">
     </foilgroup>
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </rankresponse>';
 }
@@ -408,8 +399,7 @@ sub insert_matchresponse {
       </itemgroup>
     </foilgroup>
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </matchresponse>';
 }
@@ -427,8 +417,7 @@ sub insert_hintpart {
 sub insert_hintgroup {
   return '
 <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
 </hintgroup>';
 }
 
@@ -463,11 +452,11 @@ sub insert_optionhint {
 }
 
 sub insert_startouttext {
-    return "<startouttext />\n<endouttext />";
+    return "<startouttext /><endouttext />";
 }
 
 sub insert_script {
-    return "\n<script type=\"loncapa/perl\">\n</script>";
+    return "\n<script type=\"loncapa/perl\"></script>";
 }
 
 sub textarea_sizes {
@@ -543,6 +532,9 @@ sub get_new_args {
 		$token->[2]->{$arg}=$newvalue;
 	    }
 	    $rebuild=1;
+	} elsif (!defined($newvalue) && defined($value)) {
+	    delete($token->[2]->{$arg});
+	    $rebuild=1;
 	}
     }
     return $rebuild;
@@ -711,11 +703,11 @@ ENDSELECTORTYPE
 #----------------------------------------------------- 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') {
@@ -724,66 +716,43 @@ sub entercoords {
         $element = &Apache::lonnet::escape('homework_edit_'.
                                            $Apache::lonxml::curdepth);
     }
-    my $formheight='';
-    if ($height) {
-	$formheight='&formheight='.$height.'_'.$Apache::edit::bgimgsrccurdepth;
-    }
-    my $formwidth='';
-    if ($width) {
-	$formwidth='&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
-    return $result;
-}
-
-# coordinate pair (x1,y1)-(x2,y2)
-sub entercoordpair {
-    my ($id,$mode,$width,$height) = @_;
-    unless ($Apache::edit::bgimgsrc) { return ''; }
-    my $bgfile=&Apache::lonnet::escape($Apache::edit::bgimgsrc);
-    my $form    = 'lonhomework';
-    my $element;
-    if (! defined($mode) || $mode eq 'attribute') {
-        $element = &Apache::lonnet::escape("$id\_$Apache::lonxml::curdepth");
-    } elsif ($mode eq 'textnode') {  # for data between <tag> ... </tag>
-        $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?mode=pair&formname=$form&file=$bgfile$formheight$formwidth&formcoord=$element"
-target="imagechoice">Click Coordinate Pair</a>
-ENDBUTTON
+    &Apache::lonnet::appenv(%data);
+    my $text="Click Coordinates";
+    my $result='<a href="/adm/imagechoice?token='.$id.'" target="imagechoice">'.$text.'</a>';
     return $result;
 }
 
-# coordinate polygon (x1,y1)-(x2,y2)...
-sub entercoordpolygon {
-    my ($id,$mode,$width,$height) = @_;
+# coordinates (x1,y1)-(x2,y2)...
+# mode can be either box, or polygon
+sub entercoord {
+    my ($idx,$mode,$width,$height,$type) = @_;
     unless ($Apache::edit::bgimgsrc) { return ''; }
-    &Apache::lonnet::logthis($Apache::edit::bgimgsrc);
     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') {
-        $element = &Apache::lonnet::escape("$id\_$Apache::lonxml::curdepth");
+        $element = &Apache::lonnet::escape("$idx\_$Apache::lonxml::curdepth");
     } elsif ($mode eq 'textnode') {  # for data between <tag> ... </tag>
         $element = &Apache::lonnet::escape('homework_edit_'.
                                            $Apache::lonxml::curdepth);
     }
     my $id=$Apache::lonxml::curdepth;
-    my %data=("imagechoice.$id.mode"      =>'polygon',
+    my %data=("imagechoice.$id.type"      =>$type,
 	      "imagechoice.$id.formname"  =>$form,
 	      "imagechoice.$id.file"      =>$bgfile,
 	      "imagechoice.$id.formcoord" =>$element);
@@ -796,7 +765,9 @@ sub entercoordpolygon {
 	    $Apache::edit::bgimgsrccurdepth;
     }
     &Apache::lonnet::appenv(%data);
-    my $result='<a href="/adm/imagechoice?token='.$id.'" target="imagechoice">Create Polygon Data</a>';
+    my $text="Enter Coordinates";
+    if ($type eq 'polygon') { $text='Create Polygon Data'; }
+    my $result='<a href="/adm/imagechoice?token='.$id.'" target="imagechoice">'.$text.'</a>';
     return $result;
 }