Diff for /loncom/homework/response.pm between versions 1.158 and 1.162

version 1.158, 2006/12/18 21:37:47 version 1.162, 2007/04/17 23:25:09
Line 265  sub meta_response_order { Line 265  sub meta_response_order {
 }  }
   
 sub check_for_previous {  sub check_for_previous {
     my ($curresponse,$partid,$id) = @_;      my ($curresponse,$partid,$id,$last) = @_;
     my %previous;      my %previous;
     $previous{'used'} = 0;      $previous{'used'} = 0;
     foreach my $key (sort(keys(%Apache::lonhomework::history))) {      foreach my $key (sort(keys(%Apache::lonhomework::history))) {
  if ($key =~ /resource\.$partid\.$id\.submission$/) {   if ($key =~ /resource\.$partid\.$id\.submission$/) {
       if ( $last && $key =~ /^(\d+):/ ) {
    next if ($1 >= $last);
       }
     &Apache::lonxml::debug("Trying $key");      &Apache::lonxml::debug("Trying $key");
     my $pastresponse=$Apache::lonhomework::history{$key};      my $pastresponse=$Apache::lonhomework::history{$key};
     if ($pastresponse eq $curresponse) {      if ($pastresponse eq $curresponse) {
Line 694  sub setup_params { Line 697  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 1026  sub submitted { Line 1029  sub submitted {
     if ($who eq 'scantron') { return 0; }      if ($who eq 'scantron') { return 0; }
     # if the Submit Answer button for this particular part was pressed      # if the Submit Answer button for this particular part was pressed
     my $partid=$Apache::inputtags::part;      my $partid=$Apache::inputtags::part;
     if (defined($env{'form.submit_'.$partid})) { return 1; }      if ($env{'form.submitted'} eq "part_$partid") {
    return 1;
       }
       if ($env{'form.submitted'} eq "yes"
    && defined($env{'form.submit_'.$partid})) {
    return 1;
       }
     # Submit All button on a .page was pressed      # Submit All button on a .page was pressed
     if (defined($env{'form.all_submit'})) { return 1; }      if (defined($env{'form.all_submit'})) { return 1; }
     # otherwise no submission occured      # otherwise no submission occured
Line 1086  sub check_status { Line 1095  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.158  
changed lines
  Added in v.1.162


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