--- loncom/homework/lonhomework.pm 2003/05/12 21:22:57 1.124 +++ loncom/homework/lonhomework.pm 2004/02/23 23:29:47 1.169 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.124 2003/05/12 21:22:57 www Exp $ +# $Id: lonhomework.pm,v 1.169 2004/02/23 23:29:47 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -24,11 +24,7 @@ # /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; @@ -50,197 +46,273 @@ 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 Apache::lonlocal; #use Time::HiRes qw( gettimeofday tv_interval ); BEGIN { - &Apache::lonxml::register_insert(); + &Apache::lonxml::register_insert(); } 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'); - } 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 'View' || - $ENV{'form.problemmode'} eq 'Discard Edits and View') { + 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','answer'); + ( !defined($ENV{'form.resetdata'})) && + ( !defined($ENV{'form.newrandomization'}))) { + return ('grade', 'web'); } else { - return ('web','answer'); + 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') ) { + if ( $ENV{'form.submitted'} eq 'edit' ) { + if ( $ENV{'form.submit'} eq &mt('Submit Changes and View') ) { + return ('modified','web','answer'); + } else { + return ('modified','edit'); + } + } else { + return ('edit'); + } + } else { + return ('web'); + } } - } 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'); - } } - } - 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()); + 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()); } $Apache::lonxml::browse=''; +sub check_ip_acc { + my ($acc)=@_; + if (!defined($acc) || $acc =~ /^\s*$/) { 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; +} # 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 $temp; + 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 by royal decree.')); + } + } else { + return ($ENV{'form.problemstate'}, + &mt('is in this state by royal decree.')); + } + } + &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); - 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("checking for part :$id:"); + &Apache::lonxml::debug("time:".time); + + 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 $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') { + #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 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=&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($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/ - && lc($Apache::lonhomework::problemstatus) ne 'no') { - $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 showhash { - my (%hash) = @_; - &showhashsubset(\%hash,'.'); - return ''; + my (%hash) = @_; + &showhashsubset(\%hash,'.'); + return ''; } sub showarray { @@ -261,43 +333,49 @@ 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/ ) { - &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}"); - } - } - } - &Apache::lonxml::debug("\n
restored values^
\n"); - return ''; + 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}"); + } + } + } + &Apache::lonxml::debug("\n
restored values^
\n"); + return ''; } sub setuppermissions { - $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'}); - $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}); - 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; + return '' } sub setupheader { my $request=$_[0]; if ($ENV{'browser.mathml'}) { - $request->content_type('text/xml'); + &Apache::loncommon::content_type($request,'text/xml'); } else { - $request->content_type('text/html'); + &Apache::loncommon::content_type($request,'text/html'); } - $request->content_encoding('UTF-8'); if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) { &Apache::loncommon::no_cache($request); } @@ -307,57 +385,62 @@ sub setupheader { } 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) { + $request->print("

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

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

".&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; + $request->print("".&mt("Making Backup to"). + " $filebak
"); + } else { + $request->print("".&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
"); + } else { + $request->print("". + &mt("Unable to write to")." $file"); + $error|=4; + } } - } - return $error; + return $error; } sub analyze_header { my ($request) = @_; my $result.=' - Analyzing a problem + '.&mt("Analyzing a problem").'
- - + $ENV{'request.uri'}.'"> + +
- +
- List of possible answers: + '.&mt('List of possible answers').':
'; $request->print($result); $request->rflush(); @@ -379,16 +462,15 @@ sub analyze { my $rndseed=$ENV{'form.rndseed'}; &analyze_header($request); my %prog_state= - &Apache::lonhtmlcommon::Create_PrgWin($request,'Analyze Progress', - 'Getting Problem Variants', + &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++) { &Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state, - 'last problem'); + &mt('last problem')); my $subresult=&Apache::lonnet::ssi($request->uri, ('grade_target' => 'analyze'), - ('rndseed' => $i)); - &Apache::lonxml::debug(":$subresult:"); + ('rndseed' => $i+$rndseed)); (my $garbage,$subresult)=split(/_HASH_REF__/,$subresult,2); my %analyze=&Apache::lonnet::str2hash($subresult); my @parts; @@ -406,20 +488,31 @@ sub analyze { } } &Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state, - 'Analyzing Results'); - foreach my $part (keys(%allparts)) { + &mt('Analyzing Results')); + foreach my $part (sort(keys(%allparts))) { if (defined(@{ $overall{$part.'.answer'} })) { - $request->print(''); + my $num_cols=scalar(@{ $overall{$part.'.answer'}->[0] }); + $request->print('
Part '.$part.'
'); + my %frequency; foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) { - $request->print(''); + $frequency{join("\0",@{ $answer })}++; + } + $request->print(''); + foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) { + $request->print(''); } $request->print('
'.&mt('Part').' '.$part.'
'.join('',@{ $answer }). - '
'.&mt('Answer').''.&mt('Frequency').'
'. + join('',split("\0",$answer)). + '('.$frequency{$answer}. + ')
'); } else { - $request->print('

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

'); + $request->print('

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

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

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

'); + } &Apache::lonhtmlcommon::Close_PrgWin($request,\%prog_state); &analyze_footer($request); &Apache::lonhomework::showhash(%overall); @@ -427,122 +520,121 @@ 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' ) { + 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'); - $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.=' + 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_faq(5). + &Apache::loncommon::help_open_bug('Authoring').'
'; + if ($cols > 80) { $cols = 80; } + if ($cols < 70) { $cols = 70; } + if ($rows < 20) { $rows = 20; } + $result.='
- - - + $ENV{'request.uri'}.'"> + + +
- - - + + +
' . $xml_help . ' + &HTML::Entities::encode($problem).'
'; - $request->print($result); - } - return ''; + $request->print($result); + } + return ''; } sub renderpage { - my ($request,$file) = @_; + my ($request,$file) = @_; - 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) = &get_target(); + &Apache::lonhomework::showhashsubset(\%ENV,'form.'); + &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(" ".&mt('Unable to find')." $file"); + $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); - } 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(); + 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); + } 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(); + } + #$request->print(":Result ends"); + #my $td=&tv_interval($t0); } - #$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 { @@ -550,132 +642,160 @@ sub newproblem { my $extension=$request->uri; $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 type") { + $ENV{'form.template'} ne "Select a $extension template") { use File::Copy; 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'}) { + } elsif($ENV{'form.newfile'} && !$templatelist) { # I don't like hard-coded filenames but for now, this will work. use File::Copy; - my $templatefilename = + my $templatefilename = $request->dir_config('lonIncludes').'/templates/blank.problem'; &Apache::lonxml::debug("$templatefilename"); my $dest = &Apache::lonnet::filelocation("",$request->uri); copy($templatefilename,$dest); &renderpage($request,$dest); } else { - my $templatelist=&get_template_list('',$extension); my $url=$request->uri; + my $shownurl=$url; + $shownurl=~s-^/~-/priv/-; my $dest = &Apache::lonnet::filelocation("",$request->uri); + my $errormsg; + 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,1); + 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

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

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

+$errormsg +$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; + #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 + if ( &Apache::lonnet::mod_perl_version() == 2 ) { + &Apache::lonnet::cleanenv(); + } + $request->internal_redirect('/adm/ambiguous'); return; + } + } - #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 'Answer Distribution') { - &analyze($request,$file); - } else { - &renderpage($request,$file); - } + 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')) { + &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; }