--- loncom/homework/optionresponse.pm	2001/02/19 20:36:26	1.3
+++ loncom/homework/optionresponse.pm	2001/06/11 16:13:53	1.13
@@ -1,56 +1,111 @@
 # The LearningOnline Network with CAPA
 # option list style responses
-
+# 2/21 Guy
 package Apache::optionresponse;
 use strict;
+use Apache::response;
 
 sub BEGIN {
   &Apache::lonxml::register('Apache::optionresponse',('optionresponse'));
 }
 
 sub start_optionresponse {
-  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::optionresponse',('foilgroup','foil','conceptgroup'));
+  push (@Apache::lonxml::namespace,'optionresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);
-  return '';
+  if ($target eq 'edit') {
+    $result.="<table width=\"100%\" border=\"2\"><tr><td>Multiple Option Response Question</td>
+<td>Delete:".
+  &Apache::edit::deletelist($target,$token)
+."</td></tr><tr><td colspan=\"3\">\n";
+  }
+
+  return $result;
 }
 
 sub end_optionresponse {
   &Apache::response::end_response;
+  pop @Apache::lonxml::namespace;
   return '';
 }
 
+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)=@_;
+
+  my $result='';
   %Apache::response::foilgroup={};
-  return '';
-}
+  $Apache::optionresponse::conceptgroup=0;
+  &Apache::response::setrandomnumber();
+  if ($target eq 'edit') {
+    my $optionlist="<option></option>\n";
+    my $option;
+    my @opt;
+    eval '@opt ='. &Apache::lonxml::get_param('options',$parstack,$safeeval);
 
-sub setrandomnumber {
-  my $rndseed=&Apache::lonnet::rndseed();
-  $rndseed=unpack("%32i",$rndseed);
-  $rndseed=$rndseed
-    +&Apache::lonnet::numval($Apache::inputtags::part)
-      +&Apache::lonnet::numval($Apache::inputtags::response['-1']);
-  srand($rndseed);
-  return '';
+    foreach $option (@opt) {
+      $optionlist.="<option>$option</option>\n";
+    }
+    my $insertlist=&Apache::edit::insertlist($target,$token);
+    $result.= (<<ENDTABLE);
+    <table width="100%" border="2">
+      <tr><td>Select Options</td>
+        <td>
+	  Add new Option: <input type="text" name="$Apache::lonxml::curdepth.options" />
+        </td>
+        <td>Delete an Option:
+	  <select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select>
+        </td>
+     </tr>
+     <tr><td colspan="3">$insertlist<br />
+ENDTABLE
+  }
+  if ($target eq 'modified') {
+    my @options;
+    eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
+    if ($ENV{"form.$Apache::lonxml::curdepth.options"}) {
+      my $newopt = $ENV{"form.$Apache::lonxml::curdepth.options"};
+      $newopt =~ s/\'/\\\'/g;
+      if ($options[0]) {
+	push(@options,$ENV{"form.$Apache::lonxml::curdepth.options"});
+      } else {
+	$options[0]=$ENV{"form.$Apache::lonxml::curdepth.options"};
+      }
+      $result = "<foilgroup options=\"(";
+      foreach my $option (@options) {
+	&Apache::lonxml::debug("adding option :$option:");
+	$result .="'".$option."',";
+      }
+      chop $result;
+      $result.=')">';
+    }
+  }
+  return $result;
 }
 
 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 $name;
-    &setrandomnumber();
     my ($count,$max) = &getfoilcounts($parstack,$safeeval);
     if ($count>$max) { $count=$max } 
     &Apache::lonxml::debug("Count is $count from $max");
-    my $args ='';
-    if ( $#$parstack > 0 ) { $args=$$parstack['-1']; }
     my @opt;
-    eval '@opt ='.&Apache::run::run("{$args;".'return $options}',$safeeval);
+    eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
+    &Apache::lonxml::debug("Options are $#opt");
     if ($target eq 'web') {
       $result=&displayfoils($count,@opt);
     } elsif ( $target eq 'grade') {
@@ -60,6 +115,7 @@ sub end_foilgroup {
 	my $allresponse;
 	my $right=0;
 	my $wrong=0;
+	my $ignored=0;
 	foreach $name (@whichopt) {
 	  my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};
 	  $allresponse.="$response:";
@@ -67,13 +123,15 @@ sub end_foilgroup {
 	    &Apache::lonxml::debug("submitted a $response<br />\n");
 	    my $value=$Apache::response::foilgroup{$name.'.value'};
 	    if ($value eq $response) {$right++;} else {$wrong++;}
+	  } else {
+	    $ignored++;
 	  }
 	  $temp++;
 	}
 	my $id = $Apache::inputtags::response['-1'];
 	$Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$allresponse;
-	&Apache::lonxml::debug("Got $right right and $wrong wrong");
-	if ($wrong==0) {
+	&Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored");
+	if ($wrong==0 && $ignored==0) {
 	  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS';
 	} else {
 	  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='INCORRECT';
@@ -86,10 +144,9 @@ 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 $count = $#{ $Apache::response::foilgroup{'names'} };
+  my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
+  # +1 since instructors will count from 1
+  my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
   return ($count,$max);
 }
 
@@ -98,8 +155,9 @@ sub whichfoils {
   my @names = @{ $Apache::response::foilgroup{'names'} };
   my @whichopt =();
   while ((($#whichopt+1) < $max) && ($#names > -1)) {
-    my $aopt=int rand $#names;
-    &Apache::lonxml::debug("From $#names elms, picking $aopt");
+    &Apache::lonxml::debug("Have $#whichopt max is $max");
+    my $aopt=int(rand($#names+1));
+    &Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
     $aopt=splice(@names,$aopt,1);
     &Apache::lonxml::debug("Picked $aopt");
     push (@whichopt,$aopt);
@@ -137,42 +195,77 @@ sub displayfoils {
   return $result."<br />";
 }
 
+
 sub start_conceptgroup {
+  $Apache::optionresponse::conceptgroup=1;  
+  %Apache::response::conceptgroup={};
+  return '';
 }
 
 sub end_conceptgroup {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  $Apache::optionresponse::conceptgroup=0;  
+  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");
+  }
+  return '';
 }
 
 sub start_foil {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  if ($target eq 'web') { 
-    $Apache::lonxml::redirection--; 
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result='';
+  if ($target eq 'web') { &Apache::lonxml::startredirection; }
+  if ($target eq 'edit') {
+    $result=&Apache::edit::tag_start($target,$token,"Foil");
+    my $options= &Apache::lonxml::get_param('options',$parstack,$safeeval);
+    my @opt;
+    eval '@opt ='.$options;
   }
-  return '';
+  return $result;
 }
 
 sub end_foil {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $text ='';
+  my $result = '';
+  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);
-      push @{ $Apache::response::foilgroup{'names'} }, $name;
-      $Apache::response::foilgroup{"$name.value"} = $value;
-      $Apache::response::foilgroup{"$name.text"} = $Apache::lonxml::outputstack;
+      my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
+      if (!$name) { $name=$Apache::lonxml::curdepth; }
+      if ( $Apache::optionresponse::conceptgroup ) {
+	push @{ $Apache::response::conceptgroup{'names'} }, $name;
+	$Apache::response::conceptgroup{"$name.value"} = $value;
+	$Apache::response::conceptgroup{"$name.text"} = $text;	
+      } else {
+	push @{ $Apache::response::foilgroup{'names'} }, $name;
+	$Apache::response::foilgroup{"$name.value"} = $value;
+	$Apache::response::foilgroup{"$name.text"} = $text;
+      }
     }
   }
-  if ($target eq 'web' ) {
-    $Apache::lonxml::redirection++;
-    if ($Apache::lonxml::redirection == 1) { 
-      $Apache::lonxml::outputstack=''; 
-    }
+  if ($target eq 'edit') {
+    $result.= &Apache::edit::tag_end($target,$token,'');
   }
-  return '';
+  return $result;
 }
 
+sub insert_foil {
+  return '
+<foil name="" value="">
+<starttextarea />
+<endtextarea />
+</foil>';
+}
 1;
 __END__