--- loncom/homework/edit.pm	2004/01/09 23:22:18	1.75
+++ loncom/homework/edit.pm	2005/06/07 01:33:19	1.93
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.75 2004/01/09 23:22:18 albertel Exp $
+# $Id: edit.pm,v 1.93 2005/06/07 01:33:19 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,13 +25,11 @@
 #
 # http://www.lon-capa.org/
 #
-# 3/20 Guy
-# 01/10/02 Matthew
-# 03/06/02 Matthew
+
 package Apache::edit; 
 
 use strict;
-use Apache::lonnet();
+use Apache::lonnet;
 use HTML::Entities();
 use Apache::lonlocal;
 
@@ -70,10 +68,9 @@ sub tag_start {
 #    "</tr><tr><td colspan=\"3\">\n";
 	my @help = Apache::lonxml::helpinfo($token);
 	if ($help[0]) {
-	    $result .= '<td align="right" valign="top">' .
-		Apache::loncommon::help_open_topic(@help) .
-		'</td>';
-	} else { $result .= "<td>&nbsp;</td>"; }
+	    $result .= '</td><td align="right" valign="top">' .
+		Apache::loncommon::help_open_topic(@help);
+	} else { $result .= "</td><td>&nbsp;"; }
 	$result .= &end_row().&start_spanning_row();
     }
     return $result;
@@ -150,7 +147,7 @@ sub deletelist {
 }
 
 sub handle_delete {
-    if (!$ENV{"form.delete_$Apache::lonxml::curdepth"}) { return ''; }
+    if (!$env{"form.delete_$Apache::lonxml::curdepth"}) { return ''; }
     my ($space,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result=0;
     if ($space) {
@@ -193,7 +190,7 @@ sub get_insert_list {
 		$descrip."</option>\n";
 	}
 	foreach my $option (sort(keys(%options))) {$result.=$options{$option};}
-	if ($result) { $result='<option selected="on"></option>'.$result; }
+	if ($result) { $result='<option selected="selected"></option>'.$result; }
     }
     return $result;
 }
@@ -225,9 +222,9 @@ sub innerinsertlist {
 }
 
 sub handle_insert {
-    if ($ENV{"form.insert_$Apache::lonxml::curdepth"} eq '') { return ''; }
+    if ($env{"form.insert_$Apache::lonxml::curdepth"} eq '') { return ''; }
     my $result;
-    my $tagnum = $ENV{"form.insert_$Apache::lonxml::curdepth"};
+    my $tagnum = $env{"form.insert_$Apache::lonxml::curdepth"};
     my $func=$Apache::lonxml::insertlist{"$tagnum.function"};
     if ($func eq 'default') {
 	my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
@@ -242,7 +239,7 @@ sub handle_insert {
 	    }
 	} else {
 	    my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
-	    &Apache::lonxml::error("Unable to insert tag $newtag, $func was not defined.");
+	    &Apache::lonxml::error("Unable to insert tag ".$Apache::lonxml::curdepth." ($tagnum) $newtag, func was not defined.");
 	}
     }
     return $result;
@@ -250,10 +247,10 @@ sub handle_insert {
 
 sub handle_insertafter {
     my $tagname=shift;
-    if ($ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '')
+    if ($env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '')
     { return ''; }
     my $result;
-    my $tagnum =$ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"};
+    my $tagnum =$env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"};
     my $func=$Apache::lonxml::insertlist{"$tagnum.function"};
     if ($func eq 'default') {
 	my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
@@ -284,13 +281,18 @@ sub insert_responseparam {
     <responseparam />';
 }
 
+sub insert_parameter {
+    return '
+    <parameter />';
+}
+
 sub insert_formularesponse {
     return '
 <formularesponse answer="" samples="">
-    <textline />
+    <responseparam description="Numerical Tolerance" type="tolerance" default="0.00001" name="tol" />
+    <textline size="25"/>
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </formularesponse>';
 }
@@ -298,10 +300,11 @@ sub insert_formularesponse {
 sub insert_numericalresponse {
     return '
 <numericalresponse answer="">
+<responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance" />
+<responseparam name="sig" type="int_range,0-16" default="0,15" description="Significant Figures" />
     <textline />
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </numericalresponse>';
 }
@@ -311,8 +314,7 @@ sub insert_stringresponse {
 <stringresponse answer="" type="">
     <textline />
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </stringresponse>';
 }
@@ -328,10 +330,11 @@ sub insert_imageresponse {
     return '
 <imageresponse max="1">
     <foilgroup>
+      <foil>
+      </foil>
     </foilgroup>
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </imageresponse>';
 }
@@ -340,10 +343,12 @@ sub insert_optionresponse {
     return '
 <optionresponse max="10">
     <foilgroup options="">
+      <foil>
+         <startouttext /><endouttext />
+      </foil>
     </foilgroup>
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </optionresponse>';
 }
@@ -353,8 +358,7 @@ sub insert_organicresponse {
 <organicresponse>
     <textline />
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </organicresponse>';
 }
@@ -369,10 +373,12 @@ sub insert_radiobuttonresponse {
     return '
 <radiobuttonresponse max="10">
     <foilgroup>
+      <foil>
+         <startouttext /><endouttext />
+      </foil>
     </foilgroup>
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </radiobuttonresponse>';
 }
@@ -382,8 +388,7 @@ sub insert_reactionresponse {
 <reactionresponse>
     <textline />
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </reactionresponse>';
 }
@@ -392,10 +397,12 @@ sub insert_rankresponse {
     return '
 <rankresponse max="10">
     <foilgroup options="">
+      <foil>
+         <startouttext /><endouttext />
+      </foil>
     </foilgroup>
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </rankresponse>';
 }
@@ -406,10 +413,12 @@ sub insert_matchresponse {
     <foilgroup options="">
       <itemgroup>
       </itemgroup>
+      <foil>
+         <startouttext /><endouttext />
+      </foil>
     </foilgroup>
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </matchresponse>';
 }
@@ -419,16 +428,14 @@ sub insert_displaytitle   { return '<dis
 sub insert_hintpart {
     return '
 <hintpart on="default">
-    <startouttext/>
-    <endouttext />
+    <startouttext/><endouttext />
 </hintpart>';
 }
 
 sub insert_hintgroup {
   return '
 <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
 </hintgroup>';
 }
 
@@ -463,11 +470,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 {
@@ -486,7 +493,7 @@ sub textarea_sizes {
 
 sub editline {
     my ($tag,$data,$description,$size)=@_;
-    $data=&HTML::Entities::encode($data);
+    $data=&HTML::Entities::encode($data,'<>&"');
     if ($description) { $description="<br />".$description."<br />"; }
     my $result = <<"END";
 $description
@@ -497,28 +504,40 @@ END
 }
 
 sub editfield {
-    my ($tag,$data,$description,$minwidth,$minheight)=@_;
+    my ($tag,$data,$description,$minwidth,$minheight,$usehtmlarea)=@_;
 
     my ($rows,$cols)=&textarea_sizes(\$data);
+    if (&Apache::lonhtmlcommon::htmlareabrowser() &&
+	!&Apache::lonhtmlcommon::htmlareablocked()) {
+	$rows+=7;      # make room for HTMLarea
+	$minheight+=7; # make room for HTMLarea
+    }
     if ($cols > 80) { $cols = 80; }
     if ($cols < $minwidth ) { $cols = $minwidth; }
     if ($rows < $minheight) { $rows = $minheight; }
     if ($description) { $description="<br />".$description."<br />"; }
-    return $description."\n".'&nbsp;&nbsp;&nbsp;<textarea rows="'.$rows.
+    if ($usehtmlarea) {
+	push @Apache::lonxml::htmlareafields,'homework_edit_'.
+	    $Apache::lonxml::curdepth;
+    }
+    return $description."\n".'&nbsp;&nbsp;&nbsp;<textarea style="width:100%" rows="'.$rows.
 	'" cols="'.$cols.'" name="homework_edit_'.
+	$Apache::lonxml::curdepth.'" id="homework_edit_'.
 	$Apache::lonxml::curdepth.'">'.
-	&HTML::Entities::encode($data).'</textarea>'."\n";
+	&HTML::Entities::encode($data,'<>&"').'</textarea>'.
+	($usehtmlarea?&Apache::lonhtmlcommon::spelllink('lonhomework',
+			 'homework_edit_'.$Apache::lonxml::curdepth):'')."\n";
 }
 
 sub modifiedfield {
     my ($endtag,$parser) = @_;
     my $result;
-#  foreach my $envkey (sort keys %ENV) {
-#    &Apache::lonxml::debug("$envkey ---- $ENV{$envkey}");
+#  foreach my $envkey (sort keys %env) {
+#    &Apache::lonxml::debug("$envkey ---- $env{$envkey}");
 #  }
 #  &Apache::lonxml::debug("I want homework_edit_$Apache::lonxml::curdepth");
-#  &Apache::lonxml::debug($ENV{"form.homework_edit_$Apache::lonxml::curdepth"});
-    $result=$ENV{"form.homework_edit_$Apache::lonxml::curdepth"};
+#  &Apache::lonxml::debug($env{"form.homework_edit_$Apache::lonxml::curdepth"});
+    $result=$env{"form.homework_edit_$Apache::lonxml::curdepth"};
     my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser);
     # textareas throw away intial \n 
     if ($bodytext=~/^\n/) { $result="\n".$result; }
@@ -534,7 +553,7 @@ sub get_new_args {
 	#just want the string that it was set to
 	my $value=$token->[2]->{$arg};
 	my $element=&html_element_name($arg);
-	my $newvalue=$ENV{"form.$element"};
+	my $newvalue=$env{"form.$element"};
 	&Apache::lonxml::debug("for:$arg: cur is :$value: new is :$newvalue:");
 	if (defined($newvalue) && $value ne $newvalue) {
 	    if (ref($newvalue) eq 'ARRAY') {
@@ -543,6 +562,9 @@ sub get_new_args {
 		$token->[2]->{$arg}=$newvalue;
 	    }
 	    $rebuild=1;
+	} elsif (!defined($newvalue) && defined($value)) {
+	    delete($token->[2]->{$arg});
+	    $rebuild=1;
 	}
     }
     return $rebuild;
@@ -605,7 +627,7 @@ sub checked_arg {
 	    &html_element_name($name)."'";
 	foreach my $selected (split(/,/,$allselected)) {
 	    if ( $selected eq $option ) {
-		$result.=" checked='on' ";
+		$result.=" checked='checked' ";
 		last;
 	    }
 	}
@@ -632,15 +654,15 @@ sub select_arg {
     foreach my $option (@$list) {
 	my ($text,$value);
 	if ( ref($option) eq 'ARRAY') {
-	    $value='value="'.$$option[0].'"';
+	    $value='value="'.&HTML::Entities::encode($$option[0]).'"';
 	    $text=$$option[1];
 	    $option=$$option[0];
 	} else {
 	    $text=$option;
-	    $value='value="'.$option.'"';
+	    $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
 	}
 	if ( $selected eq $option ) {
-	    $optionlist.="<option $value selected=\"on\">$text</option>\n";
+	    $optionlist.="<option $value selected=\"selected\">$text</option>\n";
 	} else {
 	    $optionlist.="<option $value >$text</option>\n";
 	}
@@ -661,22 +683,22 @@ sub select_or_text_arg {
     foreach my $option (@$list) {
 	my ($text,$value);
 	if ( ref($option) eq 'ARRAY') {
-	    $value='value="'.$$option[0].'"';
+	    $value='value="'.&HTML::Entities::encode($$option[0]).'"';
 	    $text=$$option[1];
 	    $option=$$option[0];
 	} else {
 	    $text=$option;
-	    $value='value="'.$option.'"';
+	    $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
 	}
 	if ( $selected eq $option ) {
-	    $optionlist.="<option $value selected=\"on\">$text</option>\n";
+	    $optionlist.="<option $value selected=\"selected\">$text</option>\n";
 	    $found=1;
 	} else {
 	    $optionlist.="<option $value>$text</option>\n";
 	}
     }
     $optionlist.="<option value=\"TYPEDINVALUE\"".
- 	((!$found)?' selected="on"':'').
+ 	((!$found)?' selected="selected"':'').
  	">".&mt('Type-in value')."</option>\n";
 #
     my $element=&html_element_name($name);
@@ -711,11 +733,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,77 +746,65 @@ sub entercoords {
         $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;
 }
 
-# coordinate pair (x1,y1)-(x2,y2)
-sub entercoordpair {
-    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 ''; }
-    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') {
-        $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 $formheight='';
+    my $id=$Apache::lonxml::curdepth;
+    my %data=("imagechoice.$id.type"      =>$type,
+	      "imagechoice.$id.formname"  =>$form,
+	      "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="Enter Coordinates";
+    if ($type eq 'polygon') { $text='Create Polygon Data'; }
+    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) = @_;
-    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 $id=&Apache::loncommon::get_cgi_id();
-    my %data=("cgi.$id.mode"      =>'polygon',
-	      "cgi.$id.formname"  =>$form,
-	      "cgi.$id.file"      =>$bgfile,
-	      "cgi.$id.formcoord" =>$element);
-    if ($height) {
-	$data{"cgi.$id.formheight"}=$height.'_'.$Apache::edit::bgimgsrccurdepth;
-    }
-    if ($width) {
-	$data{"cgi.$id.formwidth"}=$width.'_'.$Apache::edit::bgimgsrccurdepth;
-    }
-    &Apache::lonnet::appenv(%data);
-    my $result='<a href="/adm/imagechoice?token='.$id.'" target="imagechoice">Create Polygon Data</a>';
-    return $result;
+sub deletecoorddata {
+    &Apache::lonnet::delenv("imagechoice\\.");
 }
+
 #----------------------------------------------------- browse
 sub browse {
     # insert a link to call up the filesystem browser (lonindexer)