--- loncom/homework/lonhomework.pm 2003/10/15 17:41:10 1.155 +++ loncom/homework/lonhomework.pm 2006/06/20 03:33:55 1.251 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.155 2003/10/15 17:41:10 albertel Exp $ +# $Id: lonhomework.pm,v 1.251 2006/06/20 03:33:55 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -24,17 +24,13 @@ # /home/httpd/html/adm/gpl.txt # # http://www.lon-capa.org/ -# -# 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::lonnet; use Apache::lonplot(); use Apache::inputtags(); use Apache::structuretags(); @@ -51,63 +47,91 @@ use Apache::externalresponse(); use Apache::rankresponse(); use Apache::matchresponse(); use Apache::chemresponse(); +use Apache::drawimage(); use Apache::Constants qw(:common); use HTML::Entities(); use Apache::loncommon(); use Apache::lonlocal; -#use Time::HiRes qw( gettimeofday tv_interval ); +use Time::HiRes qw( gettimeofday tv_interval ); +use Apache::lonnet(); + +# FIXME - improve commenting + BEGIN { &Apache::lonxml::register_insert(); } + +# +# Decides what targets to render for. +# Implicit inputs: +# Various session environment variables: +# request.state - published - is a /res/ resource +# uploaded - is a /uploaded/ resource +# contruct - is a /priv/ resource +# form.grade_target - a form parameter requesting a specific target sub get_target { - if (($ENV{'request.state'} eq "published") || - ($ENV{'request.state'} eq "uploaded")) { - if ( defined($ENV{'form.grade_target'} ) - && ($ENV{'form.grade_target'} eq 'tex')) { - return ($ENV{'form.grade_target'}); - } elsif ( defined($ENV{'form.grade_target'} ) + &Apache::lonxml::debug("request.state = $env{'request.state'}"); + if( defined($env{'form.grade_target'})) { + &Apache::lonxml::debug("form.grade_target= $env{'form.grade_target'}"); + } else { + &Apache::lonxml::debug("form.grade_target "); + } + if (($env{'request.state'} eq "published") || + ($env{'request.state'} eq "uploaded")) { + if ( defined($env{'form.grade_target'} ) + && ($env{'form.grade_target'} eq 'tex')) { + return ($env{'form.grade_target'}); + } elsif ( defined($env{'form.grade_target'} ) && ($Apache::lonhomework::viewgrades eq 'F' )) { - return ($ENV{'form.grade_target'}); - } - - if ( defined($ENV{'form.submitted'}) && - ( !defined($ENV{'form.resetdata'})) && - ( !defined($ENV{'form.newrandomization'}))) { + return ($env{'form.grade_target'}); + } elsif ( $env{'form.grade_target'} eq 'webgrade' + && ($Apache::lonhomework::queuegrade eq 'F' )) { + return ($env{'form.grade_target'}); + } + if ($env{'form.webgrade'} && + ($Apache::lonhomework::modifygrades eq 'F' + || $Apache::lonhomework::queuegrade eq 'F' )) { + return ('grade','webgrade'); + } + if ( defined($env{'form.submitted'}) && + ( !defined($env{'form.resetdata'})) && + ( !defined($env{'form.newrandomization'}))) { return ('grade', 'web'); } else { return ('web'); } - } elsif ($ENV{'request.state'} eq "construct") { - if ( defined($ENV{'form.grade_target'}) ) { - return ($ENV{'form.grade_target'}); + } 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'})) { + if ( defined($env{'form.preview'})) { + if ( defined($env{'form.submitted'})) { return ('grade', 'web'); } else { return ('web'); } } else { - if ( $ENV{'form.problemmode'} eq &mt('View') || - $ENV{'form.problemmode'} eq &mt('Discard Edits and View')) { - if ( defined($ENV{'form.submitted'}) && - (!defined($ENV{'form.resetdata'})) && - (!defined($ENV{'form.newrandomization'}))) { + if ( $env{'form.problemmode'} eq &mt('View') || + $env{'form.problemmode'} eq &mt('Discard Edits and View')) { + if ( defined($env{'form.submitted'}) && + (!defined($env{'form.resetdata'})) && + (!defined($env{'form.newrandomization'}))) { return ('grade', 'web','answer'); } else { return ('web','answer'); } - } elsif ( $ENV{'form.problemmode'} eq &mt('Edit') ) { - if ( $ENV{'form.submitted'} eq 'edit' ) { - if ( $ENV{'form.submit'} eq &mt('Submit Changes and View') ) { + } elsif ( $env{'form.problemmode'} eq &mt('Edit') || + $env{'form.problemmode'} eq 'Edit') { + if ( $env{'form.submitted'} eq 'edit' ) { + if ( $env{'form.submit'} eq &mt('Submit Changes and View') ) { return ('modified','web','answer'); } else { - return ('modified','edit'); + return ('modified','no_output_web','edit'); } } else { - return ('edit'); + return ('no_output_web','edit'); } } else { return ('web'); @@ -123,12 +147,6 @@ sub setup_vars { # return ';$external::target='.$target.';'; } -sub send_header { - my ($request)= @_; - $request->print(&Apache::lontexconvert::header()); -# $request->print('
'); -} - sub createmenu { my ($which,$request)=@_; if ($which eq 'grade') { @@ -139,21 +157,48 @@ sub createmenu { } } -sub send_footer { - my ($request)= @_; -# $request->print('
'); - $request->print(&Apache::lontexconvert::footer()); +sub proctor_checked_in { + my ($slot_name,$slot,$type)=@_; + my @possible_proctors=split(",",$slot->{'proctor'}); + + return 1 if (!@possible_proctors); + + my $key; + if ($type eq 'Task') { + my $version=$Apache::lonhomework::history{'resource.0.version'}; + $key ="resource.$version.0.checkedin"; + } elsif ($type eq 'problem') { + $key ='resource.0.checkedin'; + } + # backward compatability, used to be username@domain, + # now is username:domain + my $who = $Apache::lonhomework::history{$key}; + if ($who !~ /:/) { + $who =~ tr/@/:/; + } + foreach my $possible (@possible_proctors) { + if ($who eq $possible + && $Apache::lonhomework::history{$key.'.slot'} eq $slot_name) { + return 1; + } + } + + return 0; } $Apache::lonxml::browse=''; - sub check_ip_acc { my ($acc)=@_; - if (!defined($acc) || $acc =~ /^\s*$/) { return 1; } + &Apache::lonxml::debug("acc is $acc"); + if (!defined($acc) || $acc =~ /^\s*$/ || $acc =~/^\s*no\s*$/i) { + return 1; + } my $allowed=0; my $ip=$ENV{'REMOTE_ADDR'}; my $name; foreach my $pattern (split(',',$acc)) { + $pattern =~ s/^\s*//; + $pattern =~ s/\s*$//; if ($pattern =~ /\*$/) { #35.8.* $pattern=~s/\*//; @@ -174,7 +219,7 @@ sub check_ip_acc { use Socket; my $netaddr=inet_aton($ip); ($name)=gethostbyaddr($netaddr,AF_INET); - } + } if ($name =~ /\Q$pattern\E$/i) { $allowed=1; } } elsif ($pattern =~ /\d+\.\d+\.\d+\.\d+/) { #127.0.0.1 @@ -192,6 +237,114 @@ sub check_ip_acc { } return $allowed; } + +sub check_slot_access { + my ($id,$type)=@_; + + # does it pass normal muster + my ($status,$datemsg)=&check_access($id); + + my $useslots = &Apache::lonnet::EXT("resource.$id.useslots"); + if ($useslots ne 'resource' && $useslots ne 'map' + && $useslots ne 'map_map') { + return ($status,$datemsg); + } + + if ($status eq 'SHOW_ANSWER' || + $status eq 'CLOSED' || + $status eq 'INVALID_ACCESS' || + $status eq 'UNAVAILABLE') { + return ($status,$datemsg); + } + if ($env{'request.state'} eq "construct") { + return ($status,$datemsg); + } + + if ($type eq 'Task') { + my $version=$Apache::lonhomework::history{'resource.version'}; + if ($Apache::lonhomework::history{"resource.$version.0.checkedin"} && + $Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') { + return ('SHOW_ANSWER'); + } + } + + my @slots= + (split(':',&Apache::lonnet::EXT("resource.$id.availablestudent")), + split(':',&Apache::lonnet::EXT("resource.$id.available"))); + +# if (!@slots) { +# return ($status,$datemsg); +# } + my $slotstatus='NOT_IN_A_SLOT'; + my ($returned_slot,$slot_name); + foreach my $slot (@slots) { + $slot =~ s/(^\s*|\s*$)//g; + &Apache::lonxml::debug("getting $slot"); + my %slot=&Apache::lonnet::get_slot($slot); + &Apache::lonhomework::showhash(%slot); + if ($slot{'starttime'} < time && + $slot{'endtime'} > time && + &check_ip_acc($slot{'ip'})) { + &Apache::lonxml::debug("$slot is good"); + $slotstatus='NEEDS_CHECKIN'; + $returned_slot=\%slot; + $slot_name=$slot; + last; + } + } + if ($slotstatus eq 'NEEDS_CHECKIN' && + &proctor_checked_in($slot_name,$returned_slot,$type)) { + &Apache::lonxml::debug("protoctor checked in"); + $slotstatus='CAN_ANSWER'; + } + + my ($is_correct,$got_grade,$checkedin); + if ($type eq 'Task') { + my $version=$Apache::lonhomework::history{'resource.0.version'}; + $got_grade = + ($Apache::lonhomework::history{"resource.$version.0.status"} + =~ /^(?:pass|fail)$/); + $is_correct = + ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' + || $Apache::lonhomework::history{"resource.0.solved"} =~ /^correct_/ ); + $checkedin = + $Apache::lonhomework::history{"resource.$version.0.checkedin"}; + } elsif ($type eq 'problem') { + $got_grade = 1; + $checkedin = $Apache::lonhomework::history{"resource.0.checkedin"}; + } + + &Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)"); + + # no slot is currently open, and has been checked in for this version + # but hasn't got a grade, therefore must be awaiting a grade + if (!defined($slot_name) + && $checkedin + && !$got_grade) { + return ('WAITING_FOR_GRADE'); + } + + if ($slotstatus eq 'NOT_IN_A_SLOT' + && $checkedin ) { + + if ($got_grade) { + return ('SHOW_ANSWER'); + } else { + return ('WAITING_FOR_GRADE'); + } + + } + if ( $is_correct) { + return ('SHOW_ANSWER'); + } + if ( $status eq 'CANNOT_ANSWER' && + ($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT')) { + return ($status,$datemsg); + } + + return ($slotstatus,$datemsg,$slot_name,$returned_slot); +} + # JB, 9/24/2002: Any changes in this function may require a change # in lonnavmaps::resource::getDateStatus. sub check_access { @@ -200,77 +353,100 @@ sub check_access { my $status; my $datemsg = ''; my $lastdate = ''; - my $temp; my $type; my $passed; - if ($ENV{'request.state'} eq "construct") { + if ($env{'request.state'} eq "construct") { + if ($env{'form.problemstate'}) { + if ($env{'form.problemstate'} =~ /^CANNOT_ANSWER/) { + if ( ! ($env{'form.problemstate'} eq 'CANNOT_ANSWER_correct' && + lc($Apache::lonhomework::problemstatus) eq 'no')) { + return ('CANNOT_ANSWER', + &mt('is in this state due to author settings.')); + } + } else { + return ($env{'form.problemstate'}, + &mt('is in this state due to author settings.')); + } + } &Apache::lonxml::debug("in construction ignoring dates"); $status='CAN_ANSWER'; $datemsg=&mt('is in under construction'); - return ($status,$datemsg); +# return ($status,$datemsg); } &Apache::lonxml::debug("checking for part :$id:"); &Apache::lonxml::debug("time:".time); - - my $allowed=&check_ip_acc(&Apache::lonnet::EXT("resource.$id.acc")); - if (!$allowed) { - $status='INVALID_ACCESS'; - $date=&mt("can not be accessed from your location."); - return($status,$date); - } - 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=&mt("may open later."); + my ($symb)=&Apache::lonxml::whichuser(); + &Apache::lonxml::debug("symb:".$symb); + #if ($env{'request.state'} ne "construct" && $symb ne '') { + if ($env{'request.state'} ne "construct") { + my $allowed=&check_ip_acc(&Apache::lonnet::EXT("resource.$id.acc")); + if (!$allowed && ($Apache::lonhomework::browse ne 'F')) { + $status='INVALID_ACCESS'; + $date=&mt("can not be accessed from your location."); return($status,$date); } - if ($thistype eq 'date_interval') { - if ($temp eq 'opendate') { - $date=&Apache::lonnet::EXT("resource.$id.duedate")-$date; - } - if ($temp eq 'answerdate') { - $date=&Apache::lonnet::EXT("resource.$id.duedate")+$date; - } - } - &Apache::lonxml::debug("found :$date: for :$temp:"); - if ($date eq '') { - $date = &mt("an unknown date"); $passed = 0; - } elsif ($date eq 'con_lost') { - $date = &mt("an indeterminate date"); $passed = 0; - } else { - if (time < $date) { $passed = 0; } else { $passed = 1; } - $date = localtime $date; - } - if (!$passed) { $type=$temp; last; } - } - &Apache::lonxml::debug("have :$type:$passed:"); - if ($passed) { - $status='SHOW_ANSWER'; - $datemsg=$date; - } elsif ($type eq 'opendate') { - $status='CLOSED'; - $datemsg = &mt("will open on")." $date"; - } elsif ($type eq 'duedate') { - $status='CAN_ANSWER'; - $datemsg = &mt("is due at")." $date"; - } elsif ($type eq 'answerdate') { - $status='CLOSED'; - $datemsg = &mt("was due on")." $lastdate".&mt(", and answers will be available on")." $date"; + + foreach my $temp ("opendate","duedate","answerdate") { + $lastdate = $date; + if ($temp eq 'duedate') { + $date = &due_date($id); + } else { + $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=&mt("may open later."); + return($status,$date); + } + if ($thistype eq 'date_interval') { + if ($temp eq 'opendate') { + $date=&Apache::lonnet::EXT("resource.$id.duedate")-$date; + } + if ($temp eq 'answerdate') { + $date=&Apache::lonnet::EXT("resource.$id.duedate")+$date; + } + } + &Apache::lonxml::debug("found :$date: for :$temp:"); + if ($date eq '') { + $date = &mt("an unknown date"); $passed = 0; + } elsif ($date eq 'con_lost') { + $date = &mt("an indeterminate date"); $passed = 0; + } else { + if (time < $date) { $passed = 0; } else { $passed = 1; } + $date = localtime $date; + } + if (!$passed) { $type=$temp; last; } + } + &Apache::lonxml::debug("have :$type:$passed:"); + if ($passed) { + $status='SHOW_ANSWER'; + $datemsg=$date; + } elsif ($type eq 'opendate') { + $status='CLOSED'; + $datemsg = &mt("will open on")." $date"; + } elsif ($type eq 'duedate') { + $status='CAN_ANSWER'; + $datemsg = &mt("is due at")." $date"; + } elsif ($type eq 'answerdate') { + $status='CLOSED'; + $datemsg = &mt("was due on")." $lastdate".&mt(", and answers will be available on")." $date"; + } } - if ($status eq 'CAN_ANSWER') { + if ($status eq 'CAN_ANSWER' || + (($Apache::lonhomework::browse eq 'F') && ($status eq 'CLOSED'))) { #check #tries, and if correct. my $tries = $Apache::lonhomework::history{"resource.$id.tries"}; my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); if ( $tries eq '' ) { $tries = '0'; } - if ( $maxtries eq '' ) { $maxtries = '2'; } - if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } + if ( $maxtries eq '' && + $env{'request.state'} ne 'construct') { $maxtries = '2'; } + if ($maxtries && $tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } # if (correct and show prob status) or excused then CANNOT_ANSWER if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/ && @@ -280,6 +456,19 @@ sub check_access { $status = 'CANNOT_ANSWER'; } } + if ($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER') { + my $interval=&Apache::lonnet::EXT("resource.$id.interval"); + &Apache::lonxml::debug("looking for interval $interval"); + if ($interval) { + my $first_access=&Apache::lonnet::get_first_access('map'); + &Apache::lonxml::debug("looking for accesstime $first_access"); + if (!$first_access) { + $status='NOT_YET_VIEWED'; + my $due_date = &due_date($id); + $datemsg=&seconds_to_human_length($due_date-time); + } + } + } #if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') && # (!$Apache::lonhomework::history{"resource.0.outtoken"})) { @@ -296,6 +485,48 @@ sub check_access { return ($status,$datemsg); } +# this should work exactly like the copy in lonnavmaps.pm +sub due_date { + my ($part_id,$symb,$udom,$uname)=@_; + my $date; + my $interval= &Apache::lonnet::EXT("resource.$part_id.interval",$symb, + $udom,$uname); + &Apache::lonxml::debug("looking for interval $part_id $symb $interval"); + my $due_date= &Apache::lonnet::EXT("resource.$part_id.duedate",$symb, + $udom,$uname); + &Apache::lonxml::debug("looking for due_date $part_id $symb $due_date"); + if (defined($interval)) { + my $first_access=&Apache::lonnet::get_first_access('map',$symb); + if (defined($first_access)) { + $interval = $first_access+$interval; + $date = ($interval < $due_date)? $interval : $due_date; + } else { + $date = $due_date; + } + } else { + $date = $due_date; + } + return $date +} + +sub seconds_to_human_length { + my ($length)=@_; + + my $seconds=$length%60; $length=int($length/60); + my $minutes=$length%60; $length=int($length/60); + my $hours=$length%24; $length=int($length/24); + my $days=$length; + + my $timestr; + if ($days > 0) { $timestr.=&mt('[quant,_1,day]',$days); } + if ($hours > 0) { $timestr.=($timestr?", ":""). + &mt('[quant,_1,hour]',$hours); } + if ($minutes > 0) { $timestr.=($timestr?", ":""). + &mt('[quant,_1,minute]',$minutes); } + if ($seconds > 0) { $timestr.=($timestr?", ":""). + &mt('[quant,_1,second]',$seconds); } + return $timestr; +} sub showhash { my (%hash) = @_; @@ -307,10 +538,11 @@ sub showarray { my ($array)=@_; my $string="("; foreach my $elm (@{ $array }) { - if (ref($elm)) { - if ($elm =~ /ARRAY/ ) { - $string.=&showarray($elm); - } + if (ref($elm) eq 'ARRAY') { + $string.=&showarray($elm); + } elsif (ref($elm) eq 'HASH') { + $string.= "HASH --- \n
"; + $string.= &showhashsubset($elm,'.'); } else { $string.="$elm," } @@ -324,20 +556,15 @@ sub showhashsubset { my ($hash,$keyre) = @_; my $resultkey; foreach $resultkey (sort keys %$hash) { - if ($resultkey =~ /$keyre/) { - if (ref($$hash{$resultkey})) { - if ($$hash{$resultkey} =~ /ARRAY/ ) { - &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}"); - } - } else { - &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); - } + if ($resultkey !~ /$keyre/) { next; } + if (ref($$hash{$resultkey}) eq 'ARRAY' ) { + &Apache::lonxml::debug("$resultkey ---- ". + &showarray($$hash{$resultkey})); + } elsif (ref($$hash{$resultkey}) eq 'HASH' ) { + &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); + &showhashsubset($$hash{$resultkey},'.'); + } else { + &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); } } &Apache::lonxml::debug("\n
restored values^
\n"); @@ -345,28 +572,53 @@ sub showhashsubset { } sub setuppermissions { - $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'}); - my $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}); + $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$env{'request.filename'}); + my $viewgrades = &Apache::lonnet::allowed('vgr',$env{'request.course.id'}); if (! $viewgrades && - exists($ENV{'request.course.sec'}) && - $ENV{'request.course.sec'} !~ /^\s*$/) { - $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}. - '/'.$ENV{'request.course.sec'}); + exists($env{'request.course.sec'}) && + $env{'request.course.sec'} !~ /^\s*$/) { + $viewgrades = &Apache::lonnet::allowed('vgr',$env{'request.course.id'}. + '/'.$env{'request.course.sec'}); } $Apache::lonhomework::viewgrades = $viewgrades; - return '' + + if ($Apache::lonhomework::browse eq 'F' && + $env{'form.devalidatecourseresdata'} eq 'on') { + my (undef,$courseid) = &Apache::lonxml::whichuser(); + &Apache::lonnet::devalidatecourseresdata($env{"course.$courseid.num"}, + $env{"course.$courseid.domain"}); + } + + my $modifygrades = &Apache::lonnet::allowed('mgr',$env{'request.course.id'}); + if (! $modifygrades && + exists($env{'request.course.sec'}) && + $env{'request.course.sec'} !~ /^\s*$/) { + $modifygrades = + &Apache::lonnet::allowed('mgr',$env{'request.course.id'}. + '/'.$env{'request.course.sec'}); + } + $Apache::lonhomework::modifygrades = $modifygrades; + + my $queuegrade = &Apache::lonnet::allowed('mqg',$env{'request.course.id'}); + if (! $queuegrade && + exists($env{'request.course.sec'}) && + $env{'request.course.sec'} !~ /^\s*$/) { + $queuegrade = + &Apache::lonnet::allowed('qgr',$env{'request.course.id'}. + '/'.$env{'request.course.sec'}); + } + $Apache::lonhomework::queuegrade = $queuegrade; + return ''; } sub setupheader { my $request=$_[0]; - if ($ENV{'browser.mathml'}) { - &Apache::loncommon::content_type($request,'text/xml'); - } else { - &Apache::loncommon::content_type($request,'text/html'); - } + &Apache::loncommon::content_type($request,'text/html'); if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) { &Apache::loncommon::no_cache($request); } +# $request->set_last_modified(&Apache::lonnet::metadata($request->uri, +# 'lastrevisiondate')); $request->send_http_header; return OK if $request->header_only; return '' @@ -379,35 +631,37 @@ sub handle_save_or_undo { my $filetmp =$file.".tmp"; my $error=0; - if ($ENV{'form.Undo'} eq &mt('undo')) { + &Apache::lonnet::correct_line_ends($result); + + if ($env{'form.Undo'} eq &mt('undo')) { my $error=0; if (!copy($file,$filetmp)) { $error=1; } if ((!$error) && (!copy($filebak,$file))) { $error=1; } if ((!$error) && (!move($filetmp,$filebak))) { $error=1; } if (!$error) { - $request->print("

".&mt("Undid changes, Switched")." $filebak ".&mt("and")." $file

"); + &Apache::lonxml::info("

".&mt("Undid changes, Switched")." $filebak ".&mt("and")." $file

"); } else { - $request->print("

".&mt("Unable to undo, unable to switch")." $filebak ".&mt("and")." $file

"); + &Apache::lonxml::info("

".&mt("Unable to undo, unable to switch")." $filebak ".&mt("and")." $file

"); $error=1; } } else { my $fs=Apache::File->new(">$filebak"); if (defined($fs)) { print $fs $$problem; - $request->print("".&mt("Making Backup to"). - " $filebak
"); + &Apache::lonxml::info("".&mt("Making Backup to"). + " $filebak"); } else { - $request->print("".&mt("Unable to make backup")." $filebak"); + &Apache::lonxml::info("".&mt("Unable to make backup")." $filebak"); $error=2; } my $fh=Apache::File->new(">$file"); if (defined($fh)) { print $fh $$result; - $request->print("".&mt("Saving Modifications to"). - " $file
"); + &Apache::lonxml::info("".&mt("Saving Modifications to"). + " $file"); } else { - $request->print("". - &mt("Unable to write to")." $file"); + &Apache::lonxml::info("". + &mt("Unable to write to")." $file"); $error|=4; } } @@ -416,26 +670,28 @@ sub handle_save_or_undo { sub analyze_header { my ($request) = @_; - my $result.=' - '.&mt("Analyzing a problem").' - + my $result = + &Apache::loncommon::start_page('Analyzing a problem',undef); + + $result .= + &Apache::lonxml::message_location().'
+ &HTML::Entities::encode($env{'request.uri'},'<>&"').'">'. + &Apache::structuretags::remember_problem_state().'

- '.&mt('List of possible answers').':
'; + &Apache::lonxml::add_messages(\$result); $request->print($result); $request->rflush(); } sub analyze_footer { my ($request) = @_; - my $result=''; - $request->print($result); + $request->print(&Apache::loncommon::end_page()); $request->rflush(); } @@ -444,19 +700,23 @@ sub analyze { &Apache::lonxml::debug("Analyze"); my $result; my %overall; + my %seedexample; my %allparts; - my $rndseed=$ENV{'form.rndseed'}; + my $rndseed=$env{'form.rndseed'}; &analyze_header($request); my %prog_state= &Apache::lonhtmlcommon::Create_PrgWin($request,&mt('Analyze Progress'), &mt('Getting Problem Variants'), - $ENV{'form.numtoanalyze'}); - for(my $i=1;$i<$ENV{'form.numtoanalyze'}+1;$i++) { + $env{'form.numtoanalyze'}, + 'inline',undef); + for(my $i=1;$i<$env{'form.numtoanalyze'}+1;$i++) { &Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state, &mt('last problem')); + if (&Apache::loncommon::connection_aborted($request)) { return; } + my $thisseed=$i+$rndseed; my $subresult=&Apache::lonnet::ssi($request->uri, ('grade_target' => 'analyze'), - ('rndseed' => $i+$rndseed)); + ('rndseed' => $thisseed)); (my $garbage,$subresult)=split(/_HASH_REF__/,$subresult,2); my %analyze=&Apache::lonnet::str2hash($subresult); my @parts; @@ -468,36 +728,43 @@ 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'} }); + if (($concatanswer eq '') || ($concatanswer=~/^\@/)) { + @{$analyze{$part.'.answer'}}=(''.&mt('Error').''); + } push( @{ $overall{$part.'.answer'} }, [@{ $analyze{$part.'.answer'} }]); + $seedexample{join("\0",@{ $analyze{$part.'.answer'}})}=$thisseed; } } } &Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state, &mt('Analyzing Results')); + $request->print('
'.&mt('List of possible answers').': '); foreach my $part (sort(keys(%allparts))) { if (defined(@{ $overall{$part.'.answer'} })) { my $num_cols=scalar(@{ $overall{$part.'.answer'}->[0] }); - $request->print(''); + $request->print('
'.&mt('Part').' '.$part.'
'); my %frequency; foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) { $frequency{join("\0",@{ $answer })}++; } - $request->print(''); + $request->print(''); foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) { - $request->print(''); + $request->print(''); } $request->print('
'.&mt('Part').' '.$part.'
'.&mt('Answer').''.&mt('Frequency').'
'.&mt('Answer').''.&mt('Frequency').'
(' + .&mt('click for example').')
'. - join('',split("\0",$answer)). - '('.$frequency{$answer}. - ')
'. + join('',split("\0",$answer)). + ''.$frequency{$answer}. + '
'); } else { - $request->print('

'.&mt('Part').' '.$part.' '. + $request->print('

'.&mt('Response').' '.$part.' '. &mt('is not analyzable at this time').'

'); } } if (scalar(keys(%allparts)) == 0 ) { - $request->print('

'.&mt('Found no analyzable parts in this problem, currently only Numerical, Formula and String response styles are supported.').'

'); + $request->print('

'.&mt('Found no analyzable responses in this problem, currently only Numerical, Formula and String response styles are supported.').'

'); } &Apache::lonhtmlcommon::Close_PrgWin($request,\%prog_state); &analyze_footer($request); @@ -514,66 +781,98 @@ sub editxmlmode { " $file"); $problem=''; } - if (defined($ENV{'form.editxmltext'}) || defined($ENV{'form.Undo'})) { + if (defined($env{'form.editxmltext'}) || defined($env{'form.Undo'})) { my $error=&handle_save_or_undo($request,\$problem, - \$ENV{'form.editxmltext'}); + \$env{'form.editxmltext'}); if (!$error) { $problem=&Apache::lonnet::getfile($file); } } - &Apache::lonhomework::showhashsubset(\%ENV,'^form'); - if ( $ENV{'form.submit'} eq &mt('Submit Changes and View') ) { - &Apache::lonhomework::showhashsubset(\%ENV,'^form'); - $ENV{'form.problemmode'}='View'; + &Apache::lonhomework::showhashsubset(\%env,'^form'); + if ( $env{'form.submit'} eq &mt('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::helpLatexCheatsheet("Problem_Editor_XML_Index", - "Problem Editing Help"); + my $xml_help = '
'. + &Apache::loncommon::helpLatexCheatsheet("Problem_Editor_XML_Index", + "Problem Editing Help"). + ''. + &Apache::loncommon::help_open_menu('',undef,undef,undef,5,'Authoring'). + '
'; if ($cols > 80) { $cols = 80; } if ($cols < 70) { $cols = 70; } if ($rows < 20) { $rows = 20; } - $result.=' -
+ my $start_page = + &Apache::loncommon::start_page("EditXML $file", + &Apache::edit::js_change_detection()); + + $result.=$start_page. + &renderpage($request,$file,['no_output_web'],1). + &Apache::lonxml::message_location().' + '. + &Apache::structuretags::remember_problem_state().' - - + + +
- - - + +
' . $xml_help . ' - -
'; +
+ + + '.&Apache::loncommon::end_page(); + &Apache::lonxml::add_messages(\$result); $request->print($result); } return ''; } +# +# Render the page in whatever target desired. +# sub renderpage { - my ($request,$file) = @_; + my ($request,$file,$targets,$return_string) = @_; - my (@targets) = &get_target(); + my @targets = @{$targets || [&get_target()]}; + &Apache::lonhomework::showhashsubset(\%env,'form.'); &Apache::lonxml::debug("Running targets ".join(':',@targets)); + my $overall_result; foreach my $target (@targets) { + # FIXME need to do something intelligent when a problem goes + # from viewable to not viewable due to map conditions + #&setuppermissions(); + #if ( $Apache::lonhomework::browse ne '2' + # && $Apache::lonhomework::browse ne 'F' ) { + # $request->print(" You most likely shouldn't see me."); + #} #my $t0 = [&gettimeofday()]; + my $output=1; + if ($target eq 'no_output_web') { + $target = 'web'; $output=0; + } my $problem=&Apache::lonnet::getfile($file); + my $result; if ($problem eq -1) { - &Apache::lonxml::error(" ".&mt('Unable to find')." $file"); + my $filename=(split('/',$file))[-1]; + $result.=" ".&mt('Unable to find')." $filename"; $problem=''; } my %mystyle; - my $result = ''; if ($target eq 'analyze') { %Apache::lonhomework::analyze=(); } if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); } - if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%ENV,'^form');} + if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%env,'^form');} &Apache::lonxml::debug("Should be parsing now"); - $result = &Apache::lonxml::xmlparse($request, $target, $problem, - &setup_vars($target),%mystyle); + $result .= &Apache::lonxml::xmlparse($request, $target, $problem, + &setup_vars($target),%mystyle); undef($Apache::lonhomework::parsing_a_problem); + if (!$output) { $result = ''; } #$request->print("Result follows:"); if ($target eq 'modified') { &handle_save_or_undo($request,\$problem,\$result); @@ -587,12 +886,20 @@ sub renderpage { #$result =~ s:::; #$result.="
Spent $td seconds processing target $target\n"; #} - $request->print($result); - $request->rflush(); +# $request->print($result); + $overall_result.=$result; +# $request->rflush(); } #$request->print(":Result ends"); #my $td=&tv_interval($t0); } + if (!$return_string) { + &Apache::lonxml::add_messages(\$overall_result); + $request->print($overall_result); + $request->rflush(); + } else { + return $overall_result; + } } # with no arg it returns a HTML