--- loncom/homework/lonhomework.pm 2002/10/21 20:31:06 1.98
+++ loncom/homework/lonhomework.pm 2002/11/12 05:05:26 1.101
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.98 2002/10/21 20:31:06 albertel Exp $
+# $Id: lonhomework.pm,v 1.101 2002/11/12 05:05:26 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -220,7 +220,7 @@ sub check_access {
sub showhash {
my (%hash) = @_;
- &showhashsubset(\%hash,'');
+ &showhashsubset(\%hash,'.');
return '';
}
@@ -309,14 +309,57 @@ sub handle_save_or_undo {
return $error;
}
+sub analyze_header {
+ my ($request) = @_;
+ my $result.='
+ ';
+ $request->print($result);
+ $request->rflush();
+}
+
sub analyze {
- my ($request,$file) = @_;
- &Apache::lonxml::debug("Analyze");
- my $result=&Apache::lonnet::ssi($request->uri,('grade_target' => 'analyze'));
- &Apache::lonxml::debug(":$result:");
- (my $garbage,$result)=split(/_HASH_REF__/,$result,2);
- &showhash(&Apache::lonnet::str2hash($result));
- return $result;
+ my ($request,$file) = @_;
+ &Apache::lonxml::debug("Analyze");
+ my $result;
+ my %overall;
+ my %allparts;
+ my $rndseed=$ENV{'form.rndseed'};
+ srand($rndseed);
+ &analyze_header($request);
+ for(my $i;$i<$ENV{'form.numtoanalyze'};$i++) {
+ my $subresult=&Apache::lonnet::ssi($request->uri,
+ ('grade_target' => 'analyze'),
+ ('rndseed' => rand));
+ #&Apache::lonxml::debug(":$subresult:");
+ (my $garbage,$subresult)=split(/_HASH_REF__/,$subresult,2);
+ my %analyze=&Apache::lonnet::str2hash($subresult);
+ &Apache::lonhomework::showhash(%analyze);
+ my @parts = @{ $analyze{'parts'} };
+ foreach my $part (@parts) {
+ if (!exists($allparts{$part})) {$allparts{$part}=1;};
+ if ($analyze{$part.'.type'} eq 'numericalresponse') {
+ push( @{ $overall{$part.'.answer'} },
+ [@{ $analyze{$part.'.answer'} }]);
+ }
+ }
+ }
+ foreach my $part (keys(%allparts)) {
+ $request->print('| Part '.$part.' |
');
+ foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) {
+ $request->print('| '.join(' | ',@{ $answer }).
+ ' |
');
+ }
+ }
+ &Apache::lonhomework::showhash(%overall);
+ return $result;
}
sub editxmlmode {
@@ -382,17 +425,6 @@ sub renderpage {
&Apache::outputtags::initialize_outputtags();
&Apache::edit::initialize_edit();
if ($target eq 'analyze') { %Apache::lonhomework::anaylze=(); }
- if ($target eq 'web') {
- my ($symb)=&Apache::lonxml::whichuser();
- if ($symb eq '') {
- if ($ENV{'request.state'} eq "construct") {
- } else {
- my $help = Apache::loncommon::help_open_topic("Ambiguous_Reference");
- $request->print("Browsing or ambiguous reference, submissions ignored $help
");
- }
- }
- #if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }
- }
if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); }
if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%ENV,'^form');}