--- loncom/homework/edit.pm	2003/05/06 11:54:08	1.49
+++ loncom/homework/edit.pm	2003/06/09 22:42:49	1.54
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.49 2003/05/06 11:54:08 www Exp $
+# $Id: edit.pm,v 1.54 2003/06/09 22:42:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -310,6 +310,16 @@ sub insert_essayresponse {
 </essayresponse>';
 }
 
+sub insert_imageresponse {
+  return '
+<imageresponse max="1">
+    <foilgroup>
+    </foilgroup>
+    <hintgroup>
+    </hintgroup>
+</imageresponse>';
+}
+
 sub insert_optionresponse {
   return '
 <optionresponse max="10">
@@ -386,6 +396,12 @@ sub insert_radiobuttonhint {
 </radiobuttonhint>';
 }
 
+sub insert_optionhint {
+  return '
+<optionhint>
+</optionhint>';
+}
+
 sub insert_startouttext {
   return "<startouttext />\n<endouttext />";
 }
@@ -398,9 +414,11 @@ sub textarea_sizes {
   my ($data)=@_;
   my $count=0;
   my $maxlength=-1;
-  foreach (split ("\n", $$data)) { $count++;
-	if (length($_) > $maxlength) { $maxlength = length($_); }
-      }
+  foreach (split ("\n", $$data)) {
+      $count+=int(length($_)/79);
+      $count++;
+      if (length($_) > $maxlength) { $maxlength = length($_); }
+  }
   my $rows = $count;
   my $cols = $maxlength;
   return ($rows,$cols);
@@ -454,7 +472,7 @@ sub get_new_args {
     my $element=&html_element_name($arg);
     my $newvalue=$ENV{"form.$element"};
     &Apache::lonxml::debug(" for:$arg: cur is :$value: new is :$newvalue:");
-    if ($value ne $newvalue) {
+    if (defined($newvalue) && $value ne $newvalue) {
       $token->[2]->{$arg}=$newvalue;
       $rebuild=1;
     }
@@ -621,7 +639,7 @@ sub entercoordpair {
 	$formwidth='&formwidth='.$width.'_'.$Apache::edit::bgimgsrccurdepth;
     }
     my $result = <<"ENDBUTTON";
-<a href="/cgi-bin/imagechoice.pl?mode=pair&formname=$form&file=$bgfile$formheight$formwidth"
+<a href="/cgi-bin/imagechoice.pl?mode=pair&formname=$form&file=$bgfile$formheight$formwidth&formcoord=$element"
 target="imagechoice">Click Coordinate Pair</a>
 ENDBUTTON
     return $result;