loncom/homework/lonhomework.pm - diff

Return to lonhomework.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/lonhomework.pm between versions 1.262 and 1.263

-version 1.262, 2006/11/30 01:14:17
+version 1.263, 2006/12/13 22:48:07
  Line 753  sub analyze {
  	    if ($analyze{$part.'.type'} eq 'numericalresponse'	||
  		$analyze{$part.'.type'} eq 'stringresponse'	||
  		$analyze{$part.'.type'} eq 'formularesponse'   ) {
- 		my $concatanswer=join("\0",@{ $analyze{$part.'.answer'} });
+ 		foreach my $name (keys(%{ $analyze{$part.'.answer'} })) {
- 		if (($concatanswer eq '') || ($concatanswer=~/^\@/)) {
+ 		    my $i=0;
- 		    @{$analyze{$part.'.answer'}}=('<font color="red">'.&mt('Error').'</font>');
+ 		    foreach my $answer_part (@{ $analyze{$part.'.answer'}{$name} }) {
+ 			push( @{ $overall{$part.'.answer'}[$i] },
+ 			      $answer_part);
+ 			my $concatanswer= join("\0",@{ $answer_part });
+ 			if (($concatanswer eq '') || ($concatanswer=~/^\@/)) {
+ 			    $answer_part = ['<font color="red">'.&mt('Error').'</font>'];
+ 			}
+ 			$seedexample{join("\0",$part,$i,@{$answer_part})}=
+ 			    $thisseed;
+ 			$i++;
+ 		    }
  		}
- 		push( @{ $overall{$part.'.answer'} },
- 		      [@{ $analyze{$part.'.answer'} }]);
-                 $seedexample{join("\0",@{ $analyze{$part.'.answer'}})}=$thisseed;
  	    }
  	}
      }
- Line 768  sub analyze {
+ Line 775  sub analyze {
      $request->print('<hr />'.&mt('List of possible answers').': ');
      foreach my $part (sort(keys(%allparts))) {
  	if (defined(@{ $overall{$part.'.answer'} })) {
- 	    my $num_cols=scalar(@{ $overall{$part.'.answer'}->[0] });
+ 	    for (my $i=0;$i<scalar(@{ $overall{$part.'.answer'} });$i++) {
- 	    $request->print('<table class="thinborder"><tr><th colspan="'.($num_cols+1).'">'.&mt('Part').' '.$part.'</th></tr>');
+ 		my $num_cols=scalar(@{ $overall{$part.'.answer'}[$i][0] });
- 	    my %frequency;
+ 		$request->print('<table class="thinborder"><tr><th colspan="'.($num_cols+1).'">'.&mt('Part').' '.$part);
- 	    foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) {
+ 		if (scalar(@{ $overall{$part.'.answer'} }) > 1) {
- 		$frequency{join("\0",@{ $answer })}++;
+ 		    $request->print(&mt(' Answer [_1]',$i+1));
- 	    }
+ 		}
- 	    $request->print('<tr><th colspan="'.($num_cols).'">'.&mt('Answer').'</th><th>'.&mt('Frequency').'<br />('
+ 		$request->print('</th></tr>');
- 			    .&mt('click for example').')</th></tr>');
+ 		my %frequency;
- 	    foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) {
+ 		foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'}[$i] })) {
- 		$request->print('<tr><td class="center">'.
+ 		    $frequency{join("\0",@{ $answer })}++;
- 				join('</td><td class="center">',split("\0",$answer)).
+ 		}
- 				'</td><td class="center"><a href="'.$request->uri.'?rndseed='.$seedexample{$answer}.'">'.$frequency{$answer}.
+ 		$request->print('<tr><th colspan="'.($num_cols).'">'.&mt('Answer').'</th><th>'.&mt('Frequency').'<br />('
- 				'</a></td></tr>');
+ 				.&mt('click for example').')</th></tr>');
+ 		foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) {
+ 		    $request->print('<tr><td class="center">'.
+ 				    join('</td><td class="center">',split("\0",$answer)).
+ 				    '</td><td class="center"><a href="'.$request->uri.'?rndseed='.$seedexample{join("\0",$part,$i,$answer)}.'">'.$frequency{$answer}.
+ 				    '</a></td></tr>');
+ 		}
+ 		$request->print('</table>');
  	    }
- 	    $request->print('</table>');
  	} else {
  	    $request->print('<p>'.&mt('Response').' '.$part.' '.
  			    &mt('is not analyzable at this time').'</p>');

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

Removed from v.1.262
changed lines
	Added in v.1.263