--- loncom/homework/lonhomework.pm 2002/09/24 12:39:42 1.90 +++ loncom/homework/lonhomework.pm 2003/02/25 23:18:22 1.110 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.90 2002/09/24 12:39:42 sakharuk Exp $ +# $Id: lonhomework.pm,v 1.110 2003/02/25 23:18:22 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -48,6 +48,8 @@ use Apache::optionresponse(); use Apache::imageresponse(); use Apache::essayresponse(); use Apache::externalresponse(); +use Apache::rankresponse(); +use Apache::matchresponse(); use Apache::Constants qw(:common); use HTML::Entities(); use Apache::loncommon(); @@ -125,7 +127,7 @@ sub createmenu { my ($which,$request)=@_; if ($which eq 'grade') { $request->print(''); } @@ -139,21 +141,37 @@ sub send_footer { $Apache::lonxml::browse=''; +# JB, 9/24/2002: Any changes in this function may require a change +# in lonnavmaps::resource::getDateStatus. sub check_access { my ($id) = @_; my $date =''; - my $status = ''; + my $status; my $datemsg = ''; my $lastdate = ''; my $temp; my $type; my $passed; + + if ($ENV{'request.state'} eq "construct") { + &Apache::lonxml::debug("in construction ignoring dates"); + $status='CAN_ANSWER'; + $datemsg='is in under construction'; + return ($status,$datemsg); + } + &Apache::lonxml::debug("checking for part :$id:"); &Apache::lonxml::debug("time:".time); foreach $temp ("opendate","duedate","answerdate") { $lastdate = $date; $date = &Apache::lonnet::EXT("resource.$id.$temp"); my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type"); + if ($thistype =~ /^(con_lost|no_such_host)/ || + $date =~ /^(con_lost|no_such_host)/) { + $status='UNAVAILABLE'; + $date="may open later."; + return($status,$date); + } if ($thistype eq 'date_interval') { if ($temp eq 'opendate') { $date=&Apache::lonnet::EXT("resource.$id.duedate")-$date; @@ -204,24 +222,37 @@ sub check_access { &Apache::lonxml::debug("sending back :$status:$datemsg:"); if (($Apache::lonhomework::browse eq 'F') && ($status eq 'CLOSED')) { - &Apache::lonxml::debug("should be allowed to browse a resource when closed"); + &Apache::lonxml::debug("should be allowed to browse a resource when closed"); $status='CAN_ANSWER'; $datemsg='is closed but you are allowed to view it'; } - if ($ENV{'request.state'} eq "construct") { - &Apache::lonxml::debug("in construction ignoring dates"); - $status='CAN_ANSWER'; - $datemsg='is in under construction'; - } + return ($status,$datemsg); } sub showhash { my (%hash) = @_; - &showhashsubset(\%hash,''); + &showhashsubset(\%hash,'.'); return ''; } +sub showarray { + my ($array)=@_; + my $string="("; + foreach my $elm (@{ $array }) { + if (ref($elm)) { + if ($elm =~ /ARRAY/ ) { + $string.=&showarray($elm); + } + } else { + $string.="$elm," + } + } + chop($string); + $string.=")"; + return $string; +} + sub showhashsubset { my ($hash,$keyre) = @_; my $resultkey; @@ -229,14 +260,13 @@ sub showhashsubset { if ($resultkey =~ /$keyre/) { if (ref($$hash{$resultkey})) { if ($$hash{$resultkey} =~ /ARRAY/ ) { - my $string="$resultkey ---- ("; - foreach my $elm (@{ $$hash{$resultkey} }) { - $string.="$elm,"; - } - chop($string); - &Apache::lonxml::debug("$string)"); + &Apache::lonxml::debug("$resultkey ---- ". + &showarray($$hash{$resultkey})); + } elsif ($$hash{$resultkey} =~ /HASH/ ) { + &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); + &showhashsubset($$hash{$resultkey},'.'); } else { - &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); + &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); } } else { &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); @@ -307,14 +337,76 @@ sub handle_save_or_undo { return $error; } +sub analyze_header { + my ($request) = @_; + my $result.=' + Analyzing a problem + +
+ + +
+ +
+ List of possible answers: +
'; + $request->print($result); + $request->rflush(); +} + +sub analyze_footer { + 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'}; + &analyze_header($request); + for(my $i=1;$i<$ENV{'form.numtoanalyze'}+1;$i++) { + my $subresult=&Apache::lonnet::ssi($request->uri, + ('grade_target' => 'analyze'), + ('rndseed' => $i)); + &Apache::lonxml::debug(":$subresult:"); + (my $garbage,$subresult)=split(/_HASH_REF__/,$subresult,2); + my %analyze=&Apache::lonnet::str2hash($subresult); + $Apache::lonxml::debug=1; + &Apache::lonhomework::showhash(%analyze); + $Apache::lonxml::debug=0; + my @parts = @{ $analyze{'parts'} }; + foreach my $part (@parts) { + if (!exists($allparts{$part})) {$allparts{$part}=1;}; + if ($analyze{$part.'.type'} eq 'numericalresponse' || + $analyze{$part.'.type'} eq 'stringresponse' || + $analyze{$part.'.type'} eq 'formularesponse' ) { + push( @{ $overall{$part.'.answer'} }, + [@{ $analyze{$part.'.answer'} }]); + } + } + } + foreach my $part (keys(%allparts)) { + if (defined(@{ $overall{$part.'.answer'} })) { + $request->print(''); + foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) { + $request->print(''); + } + $request->print('
Part '.$part.'
'.join('',@{ $answer }). + '
'); + } else { + $request->print('

Part '.$part. + ' is not analyzabale at this time

'); + } + } + &analyze_footer($request); + &Apache::lonhomework::showhash(%overall); + return $result; } sub editxmlmode { @@ -337,7 +429,7 @@ sub editxmlmode { &renderpage($request,$file); } else { my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem); - my $xml_help = Apache::loncommon::help_open_topic("Problem_Editor_XML_Index"); + my $xml_help = Apache::loncommon::help_open_topic("Problem_Editor_XML_Index",'Problem Editing Help'); if ($cols > 80) { $cols = 80; } if ($cols < 70) { $cols = 70; } if ($rows < 20) { $rows = 20; } @@ -352,7 +444,7 @@ sub editxmlmode {
- ' . $xml_help . ' Problem Help
+ ' . $xml_help . ' '; @@ -376,31 +468,13 @@ sub renderpage { my %mystyle; my $result = ''; - &Apache::inputtags::initialize_inputtags; - &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 'analyze') { %Apache::lonhomework::analyze=(); } if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); } if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%ENV,'^form');} -my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm'); - if ($default == -1) { - &Apache::lonxml::error("Unable to find default_homework.lcpm"); - $default=''; - } &Apache::lonxml::debug("Should be parsing now"); $result = &Apache::lonxml::xmlparse($request, $target, $problem, - $default.&setup_vars($target),%mystyle); + &setup_vars($target),%mystyle); #$request->print("Result follows:"); if ($target eq 'modified') { @@ -429,14 +503,13 @@ sub get_template_list { my $result; my @allnames; &Apache::lonxml::debug("Looking for :$extension:"); - foreach my $file () - { + foreach my $file () { my $name=&Apache::lonnet::metadata($file,'title'); if ($namewanted && ($name eq $namewanted)) { $result=$file; last; } else { - push (@allnames, $name); + if ($name) { push (@allnames, $name); } } } if (@allnames && !$result) { @@ -472,18 +545,21 @@ sub newproblem { my $url=$request->uri; my $dest = &Apache::lonnet::filelocation("",$request->uri); my $instructions; - if ($templatelist) { $instructions=", select a template from the pull-down menu below. Then";} + if ($templatelist) { $instructions=", select a template from the pull-down menu below.
Then";} $request->print(< -The requested file $url doesn\'t exist.
-To create a new $extension$instructions click on the Create $extension button. -
+

Creating a new $extension resource

+The requested file $url currently does not exist. +

+To create a new $extension$instructions click on the "Create $extension" button. +

+

ENDNEWPROBLEM if (defined($templatelist)) { $request->print(""); } $request->print("
"); - $request->print("

"); + $request->print("

"); } return ''; } @@ -505,7 +581,8 @@ sub handler { #my $t0 = [&gettimeofday()]; my $request=$_[0]; -# if ( $ENV{'user.name'} eq 'physnet' ) {$Apache::lonxml::debug=1;} +# if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} + $Apache::lonxml::debug=$ENV{'user.debug'}; if (&setupheader($request)) { return OK; } $ENV{'request.uri'}=$request->uri;