[BACK]Return to response.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/response.pm between versions 1.160 and 1.170

version 1.160, 2007/03/15 02:52:16 version 1.170, 2007/05/31 15:30:35
Line 391  sub start_customresponse { Line 391  sub start_customresponse {
   $safeeval,'answerdisplay');    $safeeval,'answerdisplay');
  if ($constructtag) {   if ($constructtag) {
     $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
     $result.=&Apache::edit::handle_insert();  
  }   }
     } elsif ($target eq 'answer' || $target eq 'grade') {      } elsif ($target eq 'answer' || $target eq 'grade') {
  &Apache::response::reset_params();   &Apache::response::reset_params();
Line 447  sub end_customresponse { Line 446  sub end_customresponse {
  $result .= &Apache::response::answer_part('customresponse',$answer);   $result .= &Apache::response::answer_part('customresponse',$answer);
  $result .= &Apache::response::answer_footer('customresponse');   $result .= &Apache::response::answer_footer('customresponse');
     }      }
       if ($target eq 'web') {
    &setup_prior_tries_hash(\&format_prior_response_math);
       }
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||       if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
  $target eq 'tex' || $target eq 'analyze') {   $target eq 'tex' || $target eq 'analyze') {
  &Apache::lonxml::increment_counter(&Apache::response::repetition());   &Apache::lonxml::increment_counter(&Apache::response::repetition());
Line 459  sub end_customresponse { Line 461  sub end_customresponse {
     return $result;      return $result;
 }  }
   
   sub format_prior_response_custom {
       my ($mode,$answer) =@_;
       return '<span class="LC_prior_custom">'.
       &HTML::Entities::encode($answer,'"<>&').'</span>';
   }
   
 sub start_mathresponse {  sub start_mathresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
Line 491  sub start_mathresponse { Line 498  sub start_mathresponse {
   $safeeval,'answerdisplay','cas','args');    $safeeval,'answerdisplay','cas','args');
  if ($constructtag) {   if ($constructtag) {
     $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
     $result.=&Apache::edit::handle_insert();  
  }   }
     } elsif ($target eq 'answer' || $target eq 'grade') {      } elsif ($target eq 'answer' || $target eq 'grade') {
  &Apache::response::reset_params();   &Apache::response::reset_params();
Line 536  sub end_mathresponse { Line 542  sub end_mathresponse {
     }      }
  }   }
     }      }
       if ($target eq 'web') {
    &setup_prior_tries_hash(\&format_prior_response_math);
       }
   
     pop(@Apache::lonxml::namespace);      pop(@Apache::lonxml::namespace);
     pop(@Apache::response::custom_answer);      pop(@Apache::response::custom_answer);
     pop(@Apache::response::custom_answer_type);      pop(@Apache::response::custom_answer_type);
Line 544  sub end_mathresponse { Line 554  sub end_mathresponse {
     return $result;      return $result;
 }  }
   
   sub format_prior_response_math {
       my ($mode,$answer) =@_;
       return '<span class="LC_prior_math">'.
       &HTML::Entities::encode($answer,'"<>&').'</span>';
   }
   
 sub implicit_multiplication {  sub implicit_multiplication {
     my ($expression)=@_;      my ($expression)=@_;
 # Escape scientific notation, so 3e8 does not become 3*e*8  # Escape scientific notation, so 3e8 does not become 3*e*8
Line 659  sub start_responseparam { Line 675  sub start_responseparam {
  }   }
  if ($constructtag) {   if ($constructtag) {
     $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
     $result.=&Apache::edit::handle_insert();  
  }   }
     } elsif ($target eq 'grade' || $target eq 'answer' || $target eq 'web' ||      } elsif ($target eq 'grade' || $target eq 'answer' || $target eq 'web' ||
      $target eq 'tex' || $target eq 'analyze' ) {       $target eq 'tex' || $target eq 'analyze' ) {
Line 697  sub setup_params { Line 712  sub setup_params {
     if ($env{'request.state'} eq 'construct') { return; }      if ($env{'request.state'} eq 'construct') { return; }
     my %paramlist=();      my %paramlist=();
     foreach my $key (keys(%Apache::lonnet::packagetab)) {      foreach my $key (keys(%Apache::lonnet::packagetab)) {
  if ($key =~ /^$tag/) {   if ($key =~ /^\Q$tag\E/) {
     my ($package,$name) = split(/&/,$key);      my ($package,$name) = split(/&/,$key);
     $paramlist{$name}=1;      $paramlist{$name}=1;
  }   }
Line 826  sub showallfoils { Line 841  sub showallfoils {
     return 0;      return 0;
 }  }
   
   =pod
   
   =item &getresponse($offset,$resulttype);
   
   Retreives the current submitted response, helps out in the case of
   scantron mode.
   
   Returns either the exact text of the submission, or a bubbled response
   converted to something usable.
   
   Optional Arguments:
     $offset - if a problem has more than one bubble response, pass in the number
               of the bubble wanted
     $resulttype - undef    -> a number between 0 and 25
                   'A is 1' -> a number between 1 and 26
                   'letter' -> a letter between 'A' and 'Z'
   
   =cut
   
 sub getresponse {  sub getresponse {
     my ($temp,$resulttype)=@_;      my ($offset,$resulttype)=@_;
     my $formparm='form.HWVAL_'.$Apache::inputtags::response['-1'];      my $formparm='form.HWVAL_'.$Apache::inputtags::response['-1'];
     my $response;      my $response;
     if (!defined($temp)) {      if (!defined($offset)) {
  $temp=1;   $offset=1;
     } else {      } else {
  $formparm.=":$temp";   $formparm.=":$offset";
     }      }
     my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,'H'=>7,      my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,'H'=>7,
     'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,'O'=>14,      'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,'O'=>14,
Line 842  sub getresponse { Line 876  sub getresponse {
     if ($env{'form.submitted'} eq 'scantron') {      if ($env{'form.submitted'} eq 'scantron') {
  my $part  = $Apache::inputtags::part;   my $part  = $Apache::inputtags::part;
  my $id    = $Apache::inputtags::response[-1];   my $id    = $Apache::inputtags::response[-1];
  $response = $env{'scantron.'.($Apache::lonxml::counter+$temp-1).   $response = $env{'scantron.'.($Apache::lonxml::counter+$offset-1).
  '.answer'};   '.answer'};
  # save bubbled letter for later   # save bubbled letter for later
  $Apache::lonhomework::results{"resource.$part.$id.scantron"}.=   $Apache::lonhomework::results{"resource.$part.$id.scantron"}.=
Line 860  sub getresponse { Line 894  sub getresponse {
     return $response;      return $response;
 }  }
   
   =pod
   
   =item &repetition();
   
   Returns the number of lines that are required to encode the weight.
   (Currently expects that there are 10 bubbles per line)
   
   =cut
   
 sub repetition {  sub repetition {
     my $id = $Apache::inputtags::part;      my $id = $Apache::inputtags::part;
     my $weight = &Apache::lonnet::EXT("resource.$id.weight");      my $weight = &Apache::lonnet::EXT("resource.$id.weight");
Line 869  sub repetition { Line 912  sub repetition {
     return $repetition;      return $repetition;
 }  }
   
   =pod
   
   =item &scored_response($part_id,$response_id);
   
   Sets the results hash elements
   
      resource.$part_id.$response_id.awarded - to the floating point
        number between 0 and 1 that was awarded on the bubbled input
   
      resource.$part_id.$response_id.awarddetail - to 'ASSIGNED_SCORE'
   
   Returns
   
      the number of bubble sheet lines that were used (and likely need to
        be passed to &Apache::lonxml::increment_counter()
   
   Arguments
   
      $part_id - id of the part to grade
      $response_id - id of the response to grade
     
   
   =cut
   
 sub scored_response {  sub scored_response {
     my ($part,$id)=@_;      my ($part,$id)=@_;
     my $repetition=&repetition();      my $repetition=&repetition();
Line 1004  sub pick_foil_for_concept { Line 1071  sub pick_foil_for_concept {
  $Apache::response::conceptgroup{'names'};   $Apache::response::conceptgroup{'names'};
   
 }  }
   #------------------------------------------------------------
   #
   #  Get a parameter associated with a problem.
   # Parameters:
   #  $id        - the id of the paramater, either a part id, 
   #               or a partid and responspe id joined by _
   #  $name      - Name of the parameter to fetch
   #  $default   - Default value for the paramter.
   #
   #  
   #
 sub get_response_param {  sub get_response_param {
     my ($id,$name,$default)=@_;      my ($id,$name,$default)=@_;
     my $parameter;      my $parameter;
Line 1095  sub check_status { Line 1172  sub check_status {
     return 2;      return 2;
 }  }
   
   sub setup_prior_tries_hash {
       my ($func,$data) = @_;
       my $part = $Apache::inputtags::part;
       my $id   = $Apache::inputtags::response[-1];
       foreach my $i (1..$Apache::lonhomework::history{'version'}) {
    my $sub_key   = "$i:resource.$part.$id.submission";
    next if (!exists($Apache::lonhomework::history{$sub_key}));
    my @other_data;
    foreach my $datum (@{ $data }) {
       if (ref($datum)) {
    push(@other_data,$datum);
       } else {
    my $info_key = "$i:resource.$part.$id.$datum";
    push(@other_data,$Apache::lonhomework::history{$info_key});
       }
    }
   
    my $output =
       &$func('grade',
      $Apache::lonhomework::history{$sub_key},
      \@other_data);
    if (defined($output)) {
       $Apache::inputtags::submission_display{$sub_key} = $output;
    }
       }
   }
   
 1;  1;
 __END__  __END__
     
Removed from v.1.160  
changed lines
  Added in v.1.170

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>