--- loncom/homework/radiobuttonresponse.pm	2001/05/31 22:34:33	1.18
+++ loncom/homework/radiobuttonresponse.pm	2001/11/07 21:23:15	1.26
@@ -10,16 +10,37 @@ sub BEGIN {
 }
 
 sub start_radiobuttonresponse {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result;
   #when in a radiobutton response use these
   &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
+  push (@Apache::lonxml::namespace,'radiobuttonresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);
-  return '';
+  if ($target eq 'meta') {
+    $result=&Apache::response::meta_package_write('radiobuttonresponse');
+  } elsif ($target eq 'edit' ) {
+    $result.=&Apache::edit::start_table($token).
+      '<tr><td>'.&Apache::lonxml::description($token)."</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";
+  } elsif ($target eq 'modified') {
+    my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+						 $safeeval,'max');
+    if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+  }
+  return $result;
 }
 
 sub end_radiobuttonresponse {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result;
+  if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
   &Apache::response::end_response;
-  return '';
+  pop @Apache::lonxml::namespace;
+  return $result;
 }
 
 %Apache::response::foilgroup={};
@@ -45,13 +66,11 @@ sub storesurvey {
 }
 
 sub end_foilgroup {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
   my $result;
-  if ($target ne 'meta') {
-    my $rrargs ='';
-    if ( $#$parstack > 0 ) { $rrargs=$$parstack['-2']; }
-    my $style = &Apache::run::run("{$rrargs;".'return $style}',$safeeval);
+  if ($target eq 'grade' || $target eq 'web') {
+    my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval,'-2');
     if ( $style eq 'survey' ) {
       if ($target eq 'web') {
 	$result=&displayallfoils();
@@ -90,9 +109,7 @@ sub end_foilgroup {
 
 sub getfoilcounts {
   my ($parstack,$safeeval)=@_;
-  my $rrargs ='';
-  if ( $#$parstack > 0 ) { $rrargs=$$parstack['-2']; }
-  my $max = &Apache::run::run("{$rrargs;".'return $max}',$safeeval);
+  my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
   my @names = @{ $Apache::response::foilgroup{'names'} };
   my $truecnt=0;
   my $falsecnt=0;
@@ -187,12 +204,23 @@ sub displayfoils {
 sub start_conceptgroup {
   $Apache::radiobuttonresponse::conceptgroup=1;
   %Apache::response::conceptgroup={};
-  return '';
+  my $result;
+  if ($target eq 'edit') {
+    $result.=&Apache::edit::tag_start($target,$token);
+    $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50').
+      "</td></tr><tr><td colspan=\"3\">\n";
+  } elsif ($target eq 'modified') {
+    my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+						 $safeeval,'concept');
+    if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+  }
+  return $result;
 }
 
 sub end_conceptgroup {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   $Apache::radiobuttonresponse::conceptgroup=0;
+  my $result;
   if ($target eq 'web' || $target eq 'grade') {
     my @names = @{ $Apache::response::conceptgroup{'names'} };
     my $pick=int rand $#names+1;
@@ -200,30 +228,35 @@ sub end_conceptgroup {
     push @{ $Apache::response::foilgroup{'names'} }, $name;
     $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};
     $Apache::response::foilgroup{"$name.value"} = $Apache::response::conceptgroup{"$name.value"};
-    my $args;
-    if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
-    my $concept = &Apache::run::run("{$args;".'return $concept}',$safeeval);
+    my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
     $Apache::response::foilgroup{"$name.concept"} = $concept;
     &Apache::lonxml::debug("Selecting $name in $concept");
+  } elsif ($target eq 'edit') {
+    $result=&Apache::edit::end_table();
   }
-  return '';
+  return $result;
+}
+
+sub insert_conceptgroup {
+  my $result="\n\t\t<conceptgroup concept=\"\">".&insert_foil()."\n\t\t</conceptgroup>\n";
+  return $result;
 }
 
 sub start_foil {
-  &Apache::lonxml::startredirection;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result='';
+  if ($target eq 'web') { &Apache::lonxml::startredirection; }
   return '';
 }
 
 sub end_foil {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $text='';
   if ($target eq 'web') { $text=&Apache::lonxml::endredirection; }
   if ($target eq 'web' || $target eq 'grade') {
-    my $args ='';
-    if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
-    my $value = &Apache::run::run("{$args;".'return $value}',$safeeval);
+    my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
     if ($value ne 'unused') {
-      my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
+      my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
       if ( $Apache::radiobuttonresponse::conceptgroup ) {
 	push @{ $Apache::response::conceptgroup{'names'} }, $name;
 	$Apache::response::conceptgroup{"$name.value"} = $value;