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

Diff for /loncom/homework/hint.pm between versions 1.29 and 1.30

version 1.29, 2002/10/25 19:02:38 version 1.30, 2002/10/28 23:31:48
Line 241  sub end_hintpart { Line 241  sub end_hintpart {
 sub start_optionhint {  sub start_optionhint {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
       &Apache::response::start_hintresponse($parstack,$safeeval);
       if ($target eq 'edit') {
    $result.=&Apache::edit::tag_start($target,$token);
    $result.=&Apache::edit::text_arg('Name:','name',$token);
    $result.=&Apache::edit::text_arg('Answer:','answer',$token,40);
    $result.=&Apache::edit::text_arg('Concept:','concept',$token,50);
       } elsif ($target eq 'modified') {
    my $constructtag=&Apache::edit::get_new_args($token,$parstack,
        $safeeval,'name',
        'answer','concept');
    if ($constructtag) {
       $result  = &Apache::edit::rebuild_tag($token);
       $result .= &Apache::edit::handle_insert();
    }
       } elsif ($target eq 'meta') {
    $result=&Apache::response::meta_package_write('numericalhint');
       }
     return $result;      return $result;
 }  }
   
 sub end_optionhint {  sub end_optionhint {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
       if ($target eq 'web') {
    my ($foilmatch,$conceptmatch)=(-1,-1);
    my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
    my $partid=$Apache::inputtags::part;
    #id submissions occured under
    my $submitid=$Apache::inputtags::response['-2'];
    my $part_id="$partid.$submitid";
    my %answer;
    my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
    if ($answer) {
       eval('%answer ='.$answer);
       &Apache::lonhomework::showhash(%answer);
       my $response = $Apache::lonhomework::history{
               "resource.$part_id.submission"};
       my %response=&Apache::lonnet::str2hash($response);
       &Apache::lonhomework::showhash(%response);
       foreach my $foil (keys(%answer)) {
    $foilmatch=1;
    if ($answer{$foil} ne $response{$foil}) {$foilmatch=0;last;}
       }
    }
    my %concept;
    my $constr=&Apache::lonxml::get_param('concept',$parstack,$safeeval);
    if ( $constr ) { eval('%concept ='.$constr); }
    my $response = $Apache::lonhomework::history{
    "resource.$part_id.submissiongrading"};
    my %response=&Apache::lonnet::str2hash($response);
    foreach my $concept (keys(%concept)) {
       my $compare;
       if ($concept{$concept} eq 'correct') {$compare=1}else{$compare=0}
       $conceptmatch=1;
       if (ref($Apache::hint::option{"$part_id.concepts"})) {
    foreach my $foil (@{ $Apache::hint::option{"$part_id.concept.$concept"} }) {
       &Apache::lonxml::debug("compare -$foil- -$response{$foil}-$compare-");
       if ( exists($response{$foil}) && 
    $response{$foil} ne $compare) {$conceptmatch=0;last;}
    }
       } else {
    $conceptmatch=0;
       }
       if ($conceptmatch eq '0') { last; }
    }
    if ( ($conceptmatch eq '-1' || $conceptmatch eq '1') &&
        ($foilmatch    eq '-1' || $foilmatch    eq '1') ) {
       push(@Apache::hint::which,$name);
    }
       } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table; }
     if ($target eq 'edit') { $result.=&Apache::edit::end_table; }      if ($target eq 'edit') { $result.=&Apache::edit::end_table; }
       &Apache::response::end_hintresponse();
     return $result;      return $result;
 }  }
   
Line 273  sub start_radiobuttonhint { Line 338  sub start_radiobuttonhint {
     return $result;      return $result;
 }  }
   
 sub end_radiobuttonhint {  sp;&end_radiobuttonhint {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
     if ($target eq 'web') {      if ($target eq 'web') {
Removed from v.1.29  
changed lines
  Added in v.1.30

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