--- loncom/homework/optionresponse.pm	2001/06/16 18:35:27	1.15
+++ loncom/homework/optionresponse.pm	2001/08/06 20:33:23	1.22
@@ -20,9 +20,14 @@ sub start_optionresponse {
     $result.=&Apache::edit::start_table($token)."<tr><td>Multiple Option Response Question</td>
 <td>Delete:".
   &Apache::edit::deletelist($target,$token)
-."</td></tr><tr><td colspan=\"3\">\n";
+    ."</td><td>&nbsp;</td></tr><tr><td colspan=\"3\">\n";
+    $result.=&Apache::edit::text_arg('Max Number Of Foils:','max',$token,'4')."</td></tr>";
+    $result.="<tr><td colspan=\"3\">\n";
+  }
+  if ($target eq 'modified') {
+    my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'max');
+    if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   }
-
   return $result;
 }
 
@@ -35,14 +40,6 @@ sub end_optionresponse {
   return $result;
 }
 
-sub insert_optionresponse {
-  return '
-<optionresponse max="10">
-    <foilgroup options=\"\">
-    </foilgroup>
-</optionresponse>';
-}
-
 %Apache::response::foilgroup={};
 sub start_foilgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
@@ -56,9 +53,10 @@ sub start_foilgroup {
     my $option;
     my @opt;
     eval '@opt ='. &Apache::lonxml::get_param('options',$parstack,$safeeval);
-    my $count=0;
+    my $count=1;
     foreach $option (@opt) {
       $optionlist.="<option value=\"$count\">$option</option>\n";
+      $count++;
     }
     my $insertlist=&Apache::edit::insertlist($target,$token);
     $result.=&Apache::edit::start_table($token);
@@ -80,7 +78,8 @@ ENDTABLE
     eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
     if ($ENV{"form.$Apache::lonxml::curdepth.deleteopt"}) {
       my $delopt=$ENV{"form.$Apache::lonxml::curdepth.deleteopt"};
-      splice(@options,$delopt,1);
+      &Apache::lonxml::debug("Deleting :$delopt:");
+      splice(@options,$delopt-1,1);
       $optchanged=1;
     }
     if ($ENV{"form.$Apache::lonxml::curdepth.options"}) {
@@ -217,10 +216,13 @@ sub start_conceptgroup {
   %Apache::response::conceptgroup={};
   my $result;
   if ($target eq 'edit') {
-    my $insertlist=&Apache::edit::insertlist($target,$token);
     $result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils");
-    my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
-    $result.="Concept: <input name=\"$Apache::lonxml::curdepth.concept\" type=\"text\" value=\"$concept\" /></td></tr><tr><td colspan=\"3\">";
+    $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50')."</td></tr>";
+    $result.="<tr><td colspan=\"3\">\n";
+  }
+  if ($target eq 'modified') {
+    my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'concept');
+    if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   }
   return $result;
 }
@@ -230,15 +232,18 @@ sub end_conceptgroup {
   $Apache::optionresponse::conceptgroup=0;
   my $result='';
   if ($target eq 'web' || $target eq 'grade') {
-    my @names = @{ $Apache::response::conceptgroup{'names'} };
-    my $pick=int rand $#names+1;
-    my $name=$names[$pick];
-    push @{ $Apache::response::foilgroup{'names'} }, $name;
-    $Apache::response::foilgroup{"$name.value"} =  $Apache::response::conceptgroup{"$name.value"};
-    $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};
-    my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
-    $Apache::response::foilgroup{"$name.concept"} = $concept;
-    &Apache::lonxml::debug("Selecting $name in $concept");
+    #if not there aren't any foils to display and thus no question
+    if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
+      my @names = @{ $Apache::response::conceptgroup{'names'} };
+      my $pick=int rand $#names+1;
+      my $name=$names[$pick];
+      push @{ $Apache::response::foilgroup{'names'} }, $name;
+      $Apache::response::foilgroup{"$name.value"} =  $Apache::response::conceptgroup{"$name.value"};
+      $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};
+      my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
+      $Apache::response::foilgroup{"$name.concept"} = $concept;
+      &Apache::lonxml::debug("Selecting $name in $concept");
+    }
   }
   if ($target eq 'edit') {
     $result=&Apache::edit::end_table();
@@ -246,6 +251,11 @@ sub end_conceptgroup {
   return $result;
 }
 
+sub insert_conceptgroup {
+  my $result="\n\t\t<conceptgroup concept=\"\">".&insert_foil()."\n\t\t</conceptgroup>\n";
+  return $result;
+}
+
 sub start_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
@@ -256,41 +266,13 @@ sub start_foil {
     if ($$tagstack['-2'] eq 'conceptgroup') { $level = '-3'; }
     my @opt;
     eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level);
-    my $value=&Apache::lonxml::get_param('value',$parstack,$safeeval);
-    my $optionlist="<option>unused</option>\n";
-    foreach my $option (@opt) {
-      if ( $value eq $option ) {
-	$optionlist.="<option selected=\"on\">$option</option>\n";
-      } else {
-	$optionlist.="<option>$option</option>\n";
-      }
-    }
-    my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval);
-    $result.="Name: <input name=\"$Apache::lonxml::curdepth.name\" type=\"text\" value=\"$name\" />".
-      "Correct Option:
-      <select name=\"$Apache::lonxml::curdepth.value\">
-        $optionlist
-      </select></td></tr><tr><td colspan=\"3\">";
+    $result.=&Apache::edit::text_arg('Name:','name',$token);
+    $result.= &Apache::edit::select_or_text_arg('Correct Option:','value',['unused',(@opt)],$token,'15');
+    $result .= '</td></tr><tr><td colspan="3">';
   }
   if ($target eq 'modified') {
-    my $constructtag=0;
-    foreach my $arg ('value','name') {
-      my $value=&Apache::lonxml::get_param($arg,$parstack,$safeeval);
-      my $newvalue=$ENV{"form.$Apache::lonxml::curdepth.$arg"};
-      &Apache::lonxml::debug(" for:$arg: cur is :$value: new is :$newvalue:");
-      if ($value ne $newvalue) {
-	$token->[2]->{$arg}=$newvalue;
-	$constructtag=1;
-      }
-    }
-    if ($constructtag) {
-      $result = '<'.$token->[1];
-      while (my ($key,$val)= each(%{$token->[2]})) {
-	&Apache::lonxml::debug("setting :$key: to  :$val:");
-	$result.=' '.$key.'="'.$val.'"';
-      }
-      $result.=">";
-    }
+    my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name');
+    if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   }
   return $result;
 }
@@ -304,7 +286,9 @@ sub end_foil {
     my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
     if ($value ne 'unused') {
       my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
+      &Apache::lonxml::debug("Got a name of :$name:");
       if (!$name) { $name=$Apache::lonxml::curdepth; }
+      &Apache::lonxml::debug("Using a name of :$name:");
       if ( $Apache::optionresponse::conceptgroup ) {
 	push @{ $Apache::response::conceptgroup{'names'} }, $name;
 	$Apache::response::conceptgroup{"$name.value"} = $value;