--- loncom/homework/edit.pm	2002/11/14 16:47:41	1.42
+++ loncom/homework/edit.pm	2003/04/30 19:40:47	1.47
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.42 2002/11/14 16:47:41 matthew Exp $
+# $Id: edit.pm,v 1.47 2003/04/30 19:40:47 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -159,7 +159,7 @@ sub handle_delete {
   }
   if (!$result) {
     my $endtag='/'.$token->[1];
-    my $bodytext=&Apache::lonxml::get_all_text($endtag,$$parser[$#$parser]);
+    my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser);
     $$parser['-1']->get_token();
     &Apache::lonxml::debug("Deleting :$bodytext: for $token->[1]");
     &Apache::lonxml::end_tag($tagstack,$parstack,$token);
@@ -327,6 +327,28 @@ sub insert_radiobuttonresponse {
 </radiobuttonresponse>';
 }
 
+sub insert_rankresponse {
+  return '
+<rankresponse max="10">
+    <foilgroup options="">
+    </foilgroup>
+    <hintgroup>
+    </hintgroup>
+</rankresponse>';
+}
+
+sub insert_matchresponse {
+  return '
+<matchresponse max="10">
+    <foilgroup options="">
+      <itemgroup>
+      </itemgroup>
+    </foilgroup>
+    <hintgroup>
+    </hintgroup>
+</matchresponse>';
+}
+
 sub insert_displayduedate { return '<displayduedate />'; }
 sub insert_displaytitle   { return '<displaytitle />'; }
 sub insert_hintpart {
@@ -343,6 +365,18 @@ sub insert_numericalhint {
 </numericalhint>';
 }
 
+sub insert_stringhint {
+  return '
+<stringhint>
+</stringhint>';
+}
+
+sub insert_formulahint {
+  return '
+<formulahint>
+</formulahint>';
+}
+
 sub insert_radiobuttonhint {
   return '
 <radiobuttonhint>
@@ -447,12 +481,17 @@ sub rebuild_tag {
   return $result;
 }
 
+sub html_element_name {
+    my ($name) = @_;
+    return $Apache::lonxml::curdepth.'.'.$name;
+}
+
 sub text_arg {
   my ($description,$name,$token,$size) = @_;
   my $result;
   if (!defined $size) { $size=20; }
   my $arg=$token->[2]{$name};
-  $result=$description.'<input name="'."$Apache::lonxml::curdepth.$name".
+  $result=$description.'&nbsp;<input name="'.&html_element_name($name).
     '" type="text" value="'.$arg.'" size="'.$size.'" />';
   return $result;
 }
@@ -476,8 +515,8 @@ sub select_arg {
 	    $optionlist.="<option $value >$option</option>\n";
 	}
     }
-    $result.=$description.'<select name="'.
-	"$Apache::lonxml::curdepth.$name".'">
+    $result.=$description.'&nbsp;<select name="'.&html_element_name($name).
+        '">
        '.$optionlist.'
       </select>';
     return $result;
@@ -506,7 +545,8 @@ sub select_or_text_arg {
     }
     $optionlist.="<option value=\"TYPEDINVALUE\">Type in value</option>\n";
     if (($found) || (!$selected)) {
-	$result.=$description.'<select name="'."$Apache::lonxml::curdepth.$name".'">
+	$result.=$description.'&nbsp;<select name="'.&html_element_name($name)
+            .'">
        '.$optionlist.'
       </select>';
     } else {