--- loncom/homework/optionresponse.pm	2001/06/16 21:23:11	1.17
+++ loncom/homework/optionresponse.pm	2001/08/13 21:44:24	1.23
@@ -17,17 +17,22 @@ sub start_optionresponse {
   push (@Apache::lonxml::namespace,'optionresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);
   if ($target eq 'edit') {
-    $result.=&Apache::edit::start_table($token)."<tr><td>Multiple Option Response Question</td>
-<td>Delete:".
-  &Apache::edit::deletelist($target,$token)
-    ."</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.=&Apache::edit::start_table($token).
+      "<tr><td>Multiple Option Response Question</td><td>Delete:".
+	&Apache::edit::deletelist($target,$token)
+	  ."</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');
+    my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+						 $safeeval,'max');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   }
+  if ($target eq 'meta') {
+    $result=&Apache::response::meta_package_write('optionresponse');
+  }
   return $result;
 }
 
@@ -40,14 +45,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)=@_;
@@ -240,15 +237,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();
@@ -257,7 +257,7 @@ sub end_conceptgroup {
 }
 
 sub insert_conceptgroup {
-  my $result="\t\t<conceptgroup concept=\"\">\n".&insert_foil()."\t\t</conceptgroup>\n";
+  my $result="\n\t\t<conceptgroup concept=\"\">".&insert_foil()."\n\t\t</conceptgroup>\n";
   return $result;
 }
 
@@ -271,9 +271,9 @@ sub start_foil {
     if ($$tagstack['-2'] eq 'conceptgroup') { $level = '-3'; }
     my @opt;
     eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level);
-    $result.=&Apache::edit::text_arg('Name:','name',$token).
-      &Apache::edit::select_arg('Correct Option:','value',['unused',(@opt)],$token).
-      '</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=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name');
@@ -291,7 +291,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;