--- loncom/homework/lonhomework.pm 2002/02/27 20:23:26 1.71 +++ loncom/homework/lonhomework.pm 2002/07/29 20:40:34 1.83 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.71 2002/02/27 20:23:26 albertel Exp $ +# $Id: lonhomework.pm,v 1.83 2002/07/29 20:40:34 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -28,20 +28,29 @@ # Guy Albertelli # 11/30 Gerd Kortemeyer # 6/1,8/17,8/18 Gerd Kortemeyer +# 7/18 Jeremy Bowers package Apache::lonhomework; use strict; -use Apache::style; -use Apache::lonxml; -use Apache::lonnet; -use Apache::lonplot; -use Apache::inputtags; -use Apache::structuretags; -use Apache::randomlabel; -use Apache::response; -use Apache::hint; -use Apache::outputtags; +use Apache::style(); +use Apache::lonxml(); +use Apache::lonnet(); +use Apache::lonplot(); +use Apache::inputtags(); +use Apache::structuretags(); +use Apache::randomlabel(); +use Apache::response(); +use Apache::hint(); +use Apache::outputtags(); +use Apache::caparesponse(); +use Apache::radiobuttonresponse(); +use Apache::optionresponse(); +use Apache::imageresponse(); +use Apache::essayresponse(); +use Apache::externalresponse(); use Apache::Constants qw(:common); +use HTML::Entities(); +use Apache::loncommon(); #use Time::HiRes qw( gettimeofday tv_interval ); BEGIN { @@ -60,6 +69,9 @@ sub get_target { return ('web'); } } elsif ($ENV{'request.state'} eq "construct") { + if ( defined($ENV{'form.grade_target'}) ) { + return ($ENV{'form.grade_target'}); + } if ( defined($ENV{'form.preview'})) { if ( defined($ENV{'form.submitted'})) { return ('grade', 'web'); @@ -76,7 +88,11 @@ sub get_target { } } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) { if ( $ENV{'form.submitted'} eq 'edit' ) { - return ('modified','edit'); + if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) { + return ('modified','web','answer'); + } else { + return ('modified','edit'); + } } else { return ('edit'); } @@ -128,6 +144,7 @@ sub check_access { my $type; my $passed; &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"); @@ -187,9 +204,30 @@ sub check_access { sub showhash { my (%hash) = @_; + &showhashsubset(\%hash,''); + return ''; +} + +sub showhashsubset { + my ($hash,$keyre) = @_; my $resultkey; - foreach $resultkey (sort keys %hash) { - &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}"); + foreach $resultkey (sort keys %$hash) { + 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)"); + } else { + &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); + } + } else { + &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); + } + } } &Apache::lonxml::debug("\n
restored values^
\n"); return ''; @@ -255,6 +293,16 @@ sub handle_save_or_undo { return $error; } +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; +} + sub editxmlmode { my ($request,$file) = @_; my $result; @@ -268,22 +316,32 @@ sub editxmlmode { \$ENV{'form.editxmltext'}); if (!$error) { $problem=&Apache::lonnet::getfile($file); } } - my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem); - if ($cols > 80) { $cols = 80; } - $result.=' + &Apache::lonhomework::showhashsubset(\%ENV,'^form'); + if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) { + &Apache::lonhomework::showhashsubset(\%ENV,'^form'); + $ENV{'form.problemmode'}='View'; + &renderpage($request,$file); + } else { + my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem); + my $xml_help = Apache::loncommon::help_open_topic("Problem_Editor_XML_Index"); + if ($cols > 80) { $cols = 80; } + $result.='
- +
+
+ ' . $xml_help . ' Problem Help
+ &HTML::Entities::encode($problem).'
'; - $request->print($result); + $request->print($result); + } return ''; } @@ -304,8 +362,10 @@ sub renderpage { my $result = ''; &Apache::inputtags::initialize_inputtags; &Apache::edit::initialize_edit; + if ($target eq 'analyze') { %Apache::lonhomework::anaylze=(); } if ($target eq 'web') { - if (&Apache::lonnet::symbread() eq '') { + my ($symb)=&Apache::lonxml::whichuser(); + if ($symb eq '') { if ($ENV{'request.state'} eq "construct") { } else { $request->print("Browsing or ambiguous reference, submissions ignored
"); @@ -314,6 +374,7 @@ sub renderpage { #if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); } } #if ($target eq 'grade') { &showhash(%Apache::lonhomework::history); } + #if ($target eq 'web') { &showhash(%ENV); } my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm'); if ($default == -1) { @@ -321,13 +382,17 @@ sub renderpage { $default=''; } &Apache::lonxml::debug("Should be parsing now"); - $result = &Apache::lonxml::xmlparse($target, $problem, + $result = &Apache::lonxml::xmlparse($request, $target, $problem, $default.&setup_vars($target),%mystyle); #$request->print("Result follows:"); if ($target eq 'modified') { &handle_save_or_undo($request,\$problem,\$result); } else { + if ($target eq 'analyze') { + $result=&Apache::lonnet::hashref2str(\%Apache::lonhomework::analyze); + undef(%Apache::lonhomework::analyze); + } #my $td=&tv_interval($t0); #if ( $Apache::lonxml::debug) { #$result =~ s:::; @@ -437,11 +502,13 @@ sub handler { &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:"); # some times multiple problemmodes are submitted, need to select # the last one - if ( defined @{ $ENV{'form.problemmode'} } ) { - &Apache::lonxml::debug("Problem Modes ".join(':',@{ $ENV{'form.problemmode'} })); - my @modes=@{ $ENV{'form.problemmode'} }; + &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'}); + if ( defined($ENV{'form.problemmode'}) && + ref($ENV{'form.problemmode'}) ) { + &Apache::lonxml::debug("Problem Mode ".join(",",@$ENV{'form.problemmode'})); + my $mode=$ENV{'form.problemmode'}->[-1]; undef $ENV{'form.problemmode'}; - $ENV{'form.problemmode'}=$modes[-1]; + $ENV{'form.problemmode'}=$mode; } &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'}); my $file=&Apache::lonnet::filelocation("",$request->uri); @@ -468,6 +535,8 @@ sub handler { &renderpage($request,$file); } elsif ($ENV{'form.problemmode'} eq 'EditXML') { &editxmlmode($request,$file); + } elsif ($ENV{'form.problemmode'} eq 'Answer Distribution') { + &analyze($request,$file); } else { &renderpage($request,$file); } @@ -477,6 +546,7 @@ sub handler { } } else { # just render the page normally outside of construction space + &Apache::lonxml::debug("not construct"); &renderpage($request,$file); } #my $td=&tv_interval($t0);