--- loncom/homework/lonhomework.pm 2003/05/23 06:45:45 1.132 +++ loncom/homework/lonhomework.pm 2005/12/21 19:05:05 1.231 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.132 2003/05/23 06:45:45 albertel Exp $ +# $Id: lonhomework.pm,v 1.231 2005/12/21 19:05:05 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(); @@ -50,211 +46,462 @@ use Apache::essayresponse(); use Apache::externalresponse(); use Apache::rankresponse(); use Apache::matchresponse(); -#use Apache::chemresponse(); +use Apache::chemresponse(); +use Apache::drawimage(); use Apache::Constants qw(:common); use HTML::Entities(); use Apache::loncommon(); -#use Time::HiRes qw( gettimeofday tv_interval ); +use Apache::lonlocal; +use Time::HiRes qw( gettimeofday tv_interval ); +use Apache::lonnet(); + +# FIXME - improve commenting + BEGIN { - &Apache::lonxml::register_insert(); + &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::lonhomework::viewgrades eq 'F' )) { - return ($ENV{'form.grade_target'}); - } - - if ( defined($ENV{'form.submitted'}) && - ( !defined($ENV{'form.resetdata'}))) { - return ('grade', 'web'); + &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 { - return ('web'); + &Apache::lonxml::debug("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'})) { - return ('grade', 'web'); - } else { - return ('web'); - } - } else { - if ( $ENV{'form.problemmode'} eq 'View' || - $ENV{'form.problemmode'} eq 'Discard Edits and View') { - if ( defined($ENV{'form.submitted'}) && - (!defined($ENV{'form.resetdata'})) ) { - return ('grade', 'web','answer'); - } else { - return ('web','answer'); - } - } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) { - if ( $ENV{'form.submitted'} eq 'edit' ) { - if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) { - return ('modified','web','answer'); - } else { - return ('modified','edit'); - } - } else { - return ('edit'); - } - } else { - return ('web'); - } + 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 ($env{'form.webgrade'} && + $Apache::lonhomework::modifygrades 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'}); + } + 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'}))) { + return ('grade', 'web','answer'); + } else { + return ('web','answer'); + } + } 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','no_output_web','edit'); + } + } else { + return ('no_output_web','edit'); + } + } else { + return ('web'); + } + } } - } - return (); + return (); } sub setup_vars { - my ($target) = @_; - return ';' + my ($target) = @_; + return ';' # return ';$external::target='.$target.';'; } sub send_header { - my ($request)= @_; - $request->print(&Apache::lontexconvert::header()); -# $request->print('
'); + my ($request)= @_; + $request->print(&Apache::lontexconvert::header()); +# $request->print(''); } sub createmenu { - my ($which,$request)=@_; - if ($which eq 'grade') { - $request->print(''); - } + } } sub send_footer { - my ($request)= @_; + my ($request)= @_; # $request->print('
'); - $request->print(&Apache::lontexconvert::footer()); + $request->print(&Apache::lontexconvert::footer()); +} + +sub proctor_checked_in { + my ($slot_name,$slot,$type)=@_; + my @possible_proctors=split(",",$slot->{'proctor'}); + + 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'; + } + + foreach my $possible (@possible_proctors) { + if ($Apache::lonhomework::history{$key} eq $possible + && $Apache::lonhomework::history{$key.'.slot'} eq $slot_name) { + return 1; + } + } + + return 0; } $Apache::lonxml::browse=''; +sub check_ip_acc { + my ($acc)=@_; + &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)) { + if ($pattern =~ /\*$/) { + #35.8.* + $pattern=~s/\*//; + if ($ip =~ /^\Q$pattern\E/) { $allowed=1; } + } elsif ($pattern =~ /(\d+\.\d+\.\d+)\.\[(\d+)-(\d+)\]$/) { + #35.8.3.[34-56] + my $low=$2; + my $high=$3; + $pattern=$1; + if ($ip =~ /^\Q$pattern\E/) { + my $last=(split(/\./,$ip))[3]; + if ($last <=$high && $last >=$low) { $allowed=1; } + } + } elsif ($pattern =~ /^\*/) { + #*.msu.edu + $pattern=~s/\*//; + if (!defined($name)) { + 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 + if ($ip =~ /^\Q$pattern\E/) { $allowed=1; } + } else { + #some.name.com + if (!defined($name)) { + use Socket; + my $netaddr=inet_aton($ip); + ($name)=gethostbyaddr($netaddr,AF_INET); + } + if ($name =~ /\Q$pattern\E$/i) { $allowed=1; } + } + if ($allowed) { last; } + } + 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') { + 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) { + &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 ($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)$/); + $checkedin = + $Apache::lonhomework::history{"resource.$version.0.checkedin"}; + } elsif ($type eq 'problem') { + $got_grade = 1; + $checkedin = $Apache::lonhomework::history{"resource.0.checkedin"}; + } + + if ($slotstatus eq 'NOT_IN_A_SLOT' + && $checkedin ) { + + if ($got_grade) { + return ('SHOW_ANSWER'); + } else { + return ('WAITING_FOR_GRADE'); + } + + } + 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 { - my ($id) = @_; - my $date =''; - 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); - } + my ($id) = @_; + my $date =''; + my $status; + my $datemsg = ''; + my $lastdate = ''; + my $type; + my $passed; + + 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); + } + + &Apache::lonxml::debug("checking for part :$id:"); + &Apache::lonxml::debug("time:".time); + + 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); + } + + foreach my $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."); + 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' || + (($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 '' && + $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/ + && + lc($Apache::lonhomework::problemstatus) ne 'no') + || + $Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) { + $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'; + $datemsg=&seconds_to_human_length($interval); + } else { + my $newdate=localtime($first_access+$interval); + if (time > ($first_access+$interval)) { + $status='CLOSED'; + $datemsg = &mt("was due on")." $newdate".&mt(", and answers will be available on")." $date"; + } else { + $datemsg = &mt("is due at")." $newdate"; + } + } + } + } + #if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') && + # (!$Apache::lonhomework::history{"resource.0.outtoken"})) { + # return ('UNCHECKEDOUT','needs to be checked out'); + #} - &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; - } - if ($temp eq 'answerdate') { - $date=&Apache::lonnet::EXT("resource.$id.duedate")+$date; - } - } - &Apache::lonxml::debug("found :$date: for :$temp:"); - if ($date eq '') { - $date = "an unknown date"; $passed = 0; - } elsif ($date eq 'con_lost') { - $date = "an indeterminate date"; $passed = 0; - } else { - if (time < $date) { $passed = 0; } else { $passed = 1; } - $date = localtime $date; + + &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"); + $status='CAN_ANSWER'; + $datemsg=&mt('is closed but you are allowed to view it'); } - 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 = "will open on $date"; - } elsif ($type eq 'duedate') { - $status='CAN_ANSWER'; - $datemsg = "is due at $date"; - } elsif ($type eq 'answerdate') { - $status='CLOSED'; - $datemsg = "was due on $lastdate, and answers will be available on $date"; - } - if ($status eq 'CAN_ANSWER') { - #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 (correct and show prob status) or excused then CANNOT_ANSWER - if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/ - && - lc($Apache::lonhomework::problemstatus) ne 'no') - || - $Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) { - $status = 'CANNOT_ANSWER'; - } - } - - if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') && - (!$Apache::lonhomework::history{"resource.0.outtoken"})) { - return ('UNCHECKEDOUT','needs to be checked out'); - } - - - &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"); - $status='CAN_ANSWER'; - $datemsg='is closed but you are allowed to view it'; - } - return ($status,$datemsg); + return ($status,$datemsg); +} + +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) = @_; - &showhashsubset(\%hash,'.'); - return ''; + my (%hash) = @_; + &showhashsubset(\%hash,'.'); + return ''; } 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," } @@ -265,111 +512,127 @@ sub showarray { } sub showhashsubset { - my ($hash,$keyre) = @_; - my $resultkey; - foreach $resultkey (sort keys %$hash) { - if ($resultkey =~ /$keyre/) { - if (ref($$hash{$resultkey})) { - if ($$hash{$resultkey} =~ /ARRAY/ ) { + my ($hash,$keyre) = @_; + my $resultkey; + foreach $resultkey (sort keys %$hash) { + if ($resultkey !~ /$keyre/) { next; } + if (ref($$hash{$resultkey}) eq 'ARRAY' ) { &Apache::lonxml::debug("$resultkey ---- ". &showarray($$hash{$resultkey})); - } elsif ($$hash{$resultkey} =~ /HASH/ ) { + } elsif (ref($$hash{$resultkey}) eq 'HASH' ) { &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); &showhashsubset($$hash{$resultkey},'.'); } else { &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); } - } else { - &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); - } - } - } - &Apache::lonxml::debug("\n
restored values^
\n"); - return ''; + } + &Apache::lonxml::debug("\n
restored values^
\n"); + return ''; } sub setuppermissions { - $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'}); - } - $Apache::lonhomework::viewgrades = $viewgrades; - return '' + $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'}); + } + $Apache::lonhomework::viewgrades = $viewgrades; # File global variable...dirt. + 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; + return ''; } sub setupheader { my $request=$_[0]; - if ($ENV{'browser.mathml'}) { - $request->content_type('text/xml'); - } else { - $request->content_type('text/html'); - } - $request->content_encoding('UTF-8'); + &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 '' } sub handle_save_or_undo { - my ($request,$problem,$result) = @_; - my $file = &Apache::lonnet::filelocation("",$request->uri); - my $filebak =$file.".bak"; - my $filetmp =$file.".tmp"; - my $error=0; - - if ($ENV{'form.Undo'} eq 'undo') { + my ($request,$problem,$result) = @_; + my $file = &Apache::lonnet::filelocation("",$request->uri); + my $filebak =$file.".bak"; + my $filetmp =$file.".tmp"; 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("

Undid changes, Switched $filebak and $file

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

Unable to undo, unable to switch $filebak and $file

"); - $error=1; - } - } else { - my $fs=Apache::File->new(">$filebak"); - if (defined($fs)) { - print $fs $$problem; - $request->print("Making Backup to $filebak
"); - } else { - $request->print("Unable to make backup $filebak"); - $error=2; - } - my $fh=Apache::File->new(">$file"); - if (defined($fh)) { - print $fh $$result; - $request->print("Saving Modifications to $file
"); + + &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) { + &Apache::lonxml::info("

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

"); + } else { + &Apache::lonxml::info("

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

"); + $error=1; + } } else { - $request->print("Unable to write to $file"); - $error|=4; + my $fs=Apache::File->new(">$filebak"); + if (defined($fs)) { + print $fs $$problem; + &Apache::lonxml::info("".&mt("Making Backup to"). + " $filebak"); + } else { + &Apache::lonxml::info("".&mt("Unable to make backup")." $filebak"); + $error=2; + } + my $fh=Apache::File->new(">$file"); + if (defined($fh)) { + print $fh $$result; + &Apache::lonxml::info("".&mt("Saving Modifications to"). + " $file"); + } else { + &Apache::lonxml::info("". + &mt("Unable to write to")." $file"); + $error|=4; + } } - } - return $error; + return $error; } sub analyze_header { my ($request) = @_; - my $result.=' - Analyzing a problem - + my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef, + ($env{'environment.remote'} ne 'off')); + my $html=&Apache::lonxml::xmlbegin(); + my $result.=$html.' + '.&mt("Analyzing a problem").' + '.$bodytag.&Apache::lonxml::message_location().'
- - + &HTML::Entities::encode($env{'request.uri'},'<>&"').'">'. + &Apache::structuretags::remember_problem_state().' + +
- +
- List of possible answers:
'; + &Apache::lonxml::add_messages(\$result); $request->print($result); $request->rflush(); } @@ -386,19 +649,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,'Analyze Progress', - 'Getting Problem Variants', - $ENV{'form.numtoanalyze'}); - for(my $i=1;$i<$ENV{'form.numtoanalyze'}+1;$i++) { + &Apache::lonhtmlcommon::Create_PrgWin($request,&mt('Analyze Progress'), + &mt('Getting Problem Variants'), + $env{'form.numtoanalyze'}, + 'inline',undef); + for(my $i=1;$i<$env{'form.numtoanalyze'}+1;$i++) { &Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state, - 'last problem'); + &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; @@ -410,38 +677,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, - 'Analyzing Results'); - foreach my $part (keys(%allparts)) { + &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('
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.'
AnswerFrequency
'.&mt('Answer').''.&mt('Frequency').'
(' + .&mt('click for example').')
'. - join('',split("\0",$answer)). - '('.$frequency{$answer}. - ')
'. + join('',split("\0",$answer)). + ''.$frequency{$answer}. + '
'); } else { - $request->print('

Part '.$part. - ' is not analyzable at this time

'); + $request->print('

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

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

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); @@ -450,122 +722,158 @@ sub analyze { } sub editxmlmode { - my ($request,$file) = @_; - my $result; - my $problem=&Apache::lonnet::getfile($file); - if ($problem eq -1) { - &Apache::lonxml::error(" Unable to find $file"); - $problem=''; - } - if (defined($ENV{'form.editxmltext'}) || defined($ENV{'form.Undo'})) { - my $error=&handle_save_or_undo($request,\$problem, - \$ENV{'form.editxmltext'}); - if (!$error) { $problem=&Apache::lonnet::getfile($file); } - } - &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",'Problem Editing Help') - .''. - &Apache::loncommon::help_open_topic("Greek_Symbols",'Greek Symbols', - undef,undef,600) - .''. - &Apache::loncommon::help_open_topic("Other_Symbols",'Other Symbols', - undef,undef,600) - .'
'; - if ($cols > 80) { $cols = 80; } - if ($cols < 70) { $cols = 70; } - if ($rows < 20) { $rows = 20; } - $result.=' -
- - - + my ($request,$file) = @_; + my $result; + my $problem=&Apache::lonnet::getfile($file); + if ($problem eq -1) { + &Apache::lonxml::error(" ".&mt('Unable to find'). + " $file"); + $problem=''; + } + if (defined($env{'form.editxmltext'}) || defined($env{'form.Undo'})) { + my $error=&handle_save_or_undo($request,\$problem, + \$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'; + &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"). + ''. + &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; } + my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef, + ($env{'environment.remote'} ne 'off')); + my $html=&Apache::lonxml::xmlbegin(); + my $head="EditXML $file". + &Apache::edit::js_change_detection().""; + + $result.=$html.$head.$bodytag. + &renderpage($request,$file,['no_output_web'],1). + &Apache::lonxml::message_location().' + '. + &Apache::structuretags::remember_problem_state().' + + + +
- - - + +
' . $xml_help . ' - +
+ +
'; - $request->print($result); - } - return ''; + &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(); - &Apache::lonxml::debug("Running targets ".join(':',@targets)); - foreach my $target (@targets) { - #my $t0 = [&gettimeofday()]; - my $problem=&Apache::lonnet::getfile($file); - if ($problem eq -1) { - &Apache::lonxml::error(" Unable to find $file"); - $problem=''; - } + 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) { + 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');} - - &Apache::lonxml::debug("Should be parsing now"); - $result = &Apache::lonxml::xmlparse($request, $target, $problem, - &setup_vars($target),%mystyle); - undef($Apache::lonhomework::parsing_a_problem); - #$request->print("Result follows:"); - if ($target eq 'modified') { - &handle_save_or_undo($request,\$problem,\$result); + my %mystyle; + if ($target eq 'analyze') { %Apache::lonhomework::analyze=(); } + if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); } + 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); + undef($Apache::lonhomework::parsing_a_problem); + if (!$output) { $result = ''; } + #$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:::; + #$result.="
Spent $td seconds processing target $target\n"; + #} +# $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 { - 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:::; - #$result.="
Spent $td seconds processing target $target\n"; - #} - $request->print($result); - $request->rflush(); + return $overall_result; } - #$request->print(":Result ends"); - #my $td=&tv_interval($t0); - } } # with no arg it returns a HTML \n'; } - } - if (@allnames && !$result) { - $result="\n'; - } - return $result; + return $result; } sub newproblem { @@ -574,14 +882,14 @@ sub newproblem { $extension=~s:^.*\.([\w]+)$:$1:; &Apache::lonxml::debug("Looking for :$extension:"); my $templatelist=&get_template_list('',$extension); - if ($ENV{'form.template'} && - $ENV{'form.template'} ne "Select a $extension template") { + if ($env{'form.template'} && + $env{'form.template'} ne "Select a $extension template") { use File::Copy; - my $file = &get_template_list($ENV{'form.template'},$extension); + my $file = &get_template_list($env{'form.template'},$extension); my $dest = &Apache::lonnet::filelocation("",$request->uri); copy($file,$dest); &renderpage($request,$dest); - } elsif($ENV{'form.newfile'} && !$templatelist) { + } elsif($env{'form.newfile'} && !$templatelist) { # I don't like hard-coded filenames but for now, this will work. use File::Copy; my $templatefilename = @@ -591,119 +899,136 @@ sub newproblem { copy($templatefilename,$dest); &renderpage($request,$dest); } else { - my $url=$request->uri; + my $url=&HTML::Entities::encode($request->uri,'<>&"'); + my $shownurl=$url; + $shownurl=~s-^/~-/priv/-; my $dest = &Apache::lonnet::filelocation("",$request->uri); my $errormsg; - if ($ENV{'form.newfile'}) { - $errormsg='

You did not select a template.

'."\n"; + if ($env{'form.newfile'}) { + $errormsg='

'.&mt('You did not select a template.').'

'."\n"; } my $instructions; - if ($templatelist) { $instructions=", select a template from the pull-down menu below.
Then";} + my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef, + ($env{'environment.remote'} ne 'off')); + if ($templatelist) { $instructions=&mt(", select a template from the pull-down menu below.").'
'.&mt("Then");} + my %lt=&Apache::lonlocal::texthash( 'create' => 'Creating a new', + 'resource' => 'resource', + 'requested' => 'The requested file', + 'not exist' => 'currently does not exist', + 'createnew' => 'To create a new', + 'click' => 'click on the', + 'Create' => 'Create', + 'button' => 'button'); $request->print(< -

Creating a new $extension resource

+$bodytag +

$lt{'create'} $extension $lt{'resource'}

$errormsg -The requested file $url currently does not exist. +$lt{'requested'} $shownurl $lt{'not exist'}.

-To create a new $extension$instructions click on the "Create $extension" button. +$lt{'createnew'} $extension$instructions $lt{'click'} "$lt{'Create'} $extension" $lt{'button'}.

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

"); } return ''; } sub view_or_edit_menu { - my ($request) = @_; - my $url=$request->uri; - $request->print(<uri,'<>&"'); + my %lt=&Apache::lonlocal::texthash( 'would' => 'Would you like to', + 'view' => 'View', + 'Edit' => 'edit', + 'or' => 'or', + 'the problem' => 'the problem'); + $request->print(<
-Would you like to or - the problem. +$lt{'would'} +<{'or'} +<{'the problem'}.
EDITMENU } sub handler { - #my $t0 = [&gettimeofday()]; - my $request=$_[0]; - - $Apache::lonxml::debug=$ENV{'user.debug'}; - - if (&setupheader($request)) { return OK; } - $ENV{'request.uri'}=$request->uri; - - #setup permissions - $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'}); - $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}); - &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:"); - # some times multiple problemmodes are submitted, need to select - # the last one - &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'}=$mode; - } - &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'}); - my $file=&Apache::lonnet::filelocation("",$request->uri); - - #check if we know where we are - if ($ENV{'request.course.fn'} && !&Apache::lonnet::symbread()) { - # if we are browsing we might not be able to know where we are - if ($Apache::lonhomework::browse ne 'F') { - #should know where we are, so ask - $request->internal_redirect('/adm/ambiguous'); return; - } - } - - my ($symb) = &Apache::lonxml::whichuser(); - &Apache::lonxml::debug('symb is '.$symb); - if ($ENV{'request.state'} eq "construct" || $symb eq '') { - if ($ENV{'form.resetdata'} eq 'Reset Submissions' || - $ENV{'form.resetdata'} eq 'New Problem Variation' ) { - my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); - &Apache::lonnet::tmpreset($symb,'',$domain,$name); - } - } - if ($ENV{'request.state'} eq "construct") { - if ( -e $file ) { - if (!(defined $ENV{'form.problemmode'})) { - #first visit to problem in construction space - #&view_or_edit_menu($request); - $ENV{'form.problemmode'}='View'; - &renderpage($request,$file); - } elsif ($ENV{'form.problemmode'} eq 'EditXML') { - &editxmlmode($request,$file); - } elsif ($ENV{'form.problemmode'} eq 'Calculate answers') { - &analyze($request,$file); - } else { - &renderpage($request,$file); - } + #my $t0 = [&gettimeofday()]; + my $request=$_[0]; + $Apache::lonxml::request=$request; + $Apache::lonxml::debug=$env{'user.debug'}; + $env{'request.uri'}=$request->uri; + &setuppermissions(); + # some times multiple problemmodes are submitted, need to select + # the last one + if ( defined($env{'form.problemmode'}) && ref($env{'form.problemmode'}) ) { + my $mode=$env{'form.problemmode'}->[-1]; + undef $env{'form.problemmode'}; + $env{'form.problemmode'}=$mode; + } + + my $file=&Apache::lonnet::filelocation("",$request->uri); + + #check if we know where we are + if ($env{'request.course.fn'} && !&Apache::lonnet::symbread()) { + # if we are browsing we might not be able to know where we are + if ($Apache::lonhomework::browse ne 'F' && + $env{'request.state'} ne "construct") { + #should know where we are, so ask + $request->internal_redirect('/adm/ambiguous'); return OK; + } + } + if (&setupheader($request)) { return OK; } + &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:"); + &Apache::lonxml::debug("Problem Mode ".$env{'form.problemmode'}); + my ($symb) = &Apache::lonxml::whichuser(); + &Apache::lonxml::debug('symb is '.$symb); + if ($env{'request.state'} eq "construct" || $symb eq '') { + if ($env{'form.resetdata'} eq &mt('Reset Submissions') || + $env{'form.resetdata'} eq &mt('New Problem Variation') || + $env{'form.newrandomization'} eq &mt('New Randomization')) { + my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); + &Apache::lonnet::tmpreset($symb,'',$domain,$name); + &Apache::lonxml::debug("Attempt reset"); + } + } + if ($env{'request.state'} eq "construct") { + if ( -e $file ) { + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['problemmode']); + if (!(defined $env{'form.problemmode'})) { + #first visit to problem in construction space + #&view_or_edit_menu($request); + $env{'form.problemmode'}='View'; + &renderpage($request,$file); + } elsif ($env{'form.problemmode'} eq &mt('EditXML') || + $env{'form.problemmode'} eq 'EditXML') { + &editxmlmode($request,$file); + } elsif ($env{'form.problemmode'} eq &mt('Calculate answers')) { + &analyze($request,$file); + } else { + &renderpage($request,$file); + } + } else { + # requested file doesn't exist in contruction space + &newproblem($request); + } } else { - # requested file doesn't exist in contruction space - &newproblem($request); + # just render the page normally outside of construction space + &Apache::lonxml::debug("not construct"); + &renderpage($request,$file); } - } else { - # just render the page normally outside of construction space - &Apache::lonxml::debug("not construct"); - &renderpage($request,$file); - } - #my $td=&tv_interval($t0); - #&Apache::lonxml::debug("Spent $td seconds processing"); - # &Apache::lonhomework::send_footer($request); - # always turn off debug messages - $Apache::lonxml::debug=0; - return OK; + #my $td=&tv_interval($t0); + #&Apache::lonxml::debug("Spent $td seconds processing"); + # &Apache::lonhomework::send_footer($request); + # always turn off debug messages + $Apache::lonxml::debug=0; + return OK; }