--- loncom/homework/lonhomework.pm 2001/12/04 14:51:19 1.64 +++ loncom/homework/lonhomework.pm 2004/12/22 22:05:40 1.190 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.64 2001/12/04 14:51:19 albertel Exp $ +# $Id: lonhomework.pm,v 1.190 2004/12/22 22:05:40 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -24,426 +24,853 @@ # /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 + package Apache::lonhomework; use strict; -use Apache::style; -use Apache::lonxml; -use Apache::lonnet; -use Apache::inputtags; -use Apache::structuretags; -use Apache::randomlabel; -use Apache::response; -use Apache::hint; -use Apache::outputtags; +use Apache::style(); +use Apache::lonxml(); +use Apache::lonnet(); +use Apache::lonplot(); +use Apache::inputtags(); +use Apache::structuretags(); +use Apache::randomlabel(); +use Apache::response(); +use Apache::hint(); +use Apache::outputtags(); +use Apache::caparesponse(); +use Apache::radiobuttonresponse(); +use Apache::optionresponse(); +use Apache::imageresponse(); +use Apache::essayresponse(); +use Apache::externalresponse(); +use Apache::rankresponse(); +use Apache::matchresponse(); +use Apache::chemresponse(); +use Apache::drawimage(); use Apache::Constants qw(:common); -#use Time::HiRes qw( gettimeofday tv_interval ); +use HTML::Entities(); +use Apache::loncommon(); +use Apache::lonlocal; +use Time::HiRes qw( gettimeofday tv_interval ); +use Apache::lonnet(); + +# FIXME - improve commenting + -sub BEGIN { - &Apache::lonxml::register_insert(); +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") { - if ( defined($ENV{'form.submitted'})) { - 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.preview'})) { - if ( defined($ENV{'form.submitted'})) { - return ('grade', 'web'); - } else { - return ('web'); - } - } else { - if ( $ENV{'form.problemmode'} eq '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{'form.problemmode'} eq 'Edit' ) { - if ( $ENV{'form.submitted'} eq 'edit' ) { - return ('modified','edit'); + } 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 { - return ('edit'); + 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'} ee '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'); + } } - } 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; - &Apache::lonxml::debug("checking for part :$id:"); - foreach $temp ("opendate","duedate","answerdate") { - $lastdate = $date; - $date = &Apache::lonnet::EXT("resource.$id.$temp"); - &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; + 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 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); } - 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 - 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 (($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'; - } - if ($ENV{'request.state'} eq "construct") { - &Apache::lonxml::debug("in construction ignoring dates"); - $status='CAN_ANSWER'; - $datemsg='is in under construction'; - } - return ($status,$datemsg); + + &Apache::lonxml::debug("checking for part :$id:"); + &Apache::lonxml::debug("time:".time); + + 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 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=' '.$interval.' seconds'; + } 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("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'); + } + + return ($status,$datemsg); } sub showhash { - my (%hash) = @_; - my $resultkey; - foreach $resultkey (sort keys %hash) { - &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}"); - } - &Apache::lonxml::debug("\n
restored values^
\n"); - 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); + } + } else { + $string.="$elm," + } + } + chop($string); + $string.=")"; + return $string; +} + +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 ''; } 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; # 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"}); + } + return '' } sub setupheader { - my $request=$_[0]; - if ($ENV{'browser.mathml'}) { - $request->content_type('text/xml'); - } else { - $request->content_type('text/html'); - } - if (!$Apache::lonxml::debug) { &Apache::loncommon::no_cache($request); } - $request->send_http_header; - return OK if $request->header_only; - return '' + my $request=$_[0]; + if ($ENV{'browser.mathml'}) { + &Apache::loncommon::content_type($request,'text/xml'); + } else { + &Apache::loncommon::content_type($request,'text/html'); + } + if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) { + &Apache::loncommon::no_cache($request); + } + $request->send_http_header; + return OK if $request->header_only; + return '' } sub handle_save_or_undo { - my ($request,$problem,$result) = @_; - my $fileout = &Apache::lonnet::filelocation("",$request->uri); - my $filesave=$fileout.".bak"; - my $error=0; - - if ($ENV{'form.Undo'} eq 'undo') { - if (copy($filesave,$fileout)) { - $request->print("Undid changes, Copied $filesave to $fileout
"); + my ($request,$problem,$result) = @_; + my $file = &Apache::lonnet::filelocation("",$request->uri); + my $filebak =$file.".bak"; + my $filetmp =$file.".tmp"; + my $error=0; + + &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 undo, unable to copy $filesave to $fileout
"); - $error=1; + 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; + } } - } else { - my $fs=Apache::File->new(">$filesave"); - if (defined($fs)) { - print $fs $$problem; - $request->print("Making Backup to $filesave
"); - } else { - $request->print("Unable to make backup $filesave"); - $error=2; + return $error; +} + +sub analyze_header { + my ($request) = @_; + my $bodytag=''; + if ($ENV{'environment.remote'} eq 'off') { + $bodytag=&Apache::loncommon::bodytag(); + } + my $result.=' + '.&mt("Analyzing a problem").' + '.$bodytag.&Apache::lonxml::message_location().' +
'. + &Apache::structuretags::remember_problem_state().' + + +
+ +
+
'; + &Apache::lonxml::add_messages(\$result); + $request->print($result); + $request->rflush(); +} + +sub analyze_footer { + my ($request) = @_; + my $result=''; + $request->print($result); + $request->rflush(); +} + +sub analyze { + my ($request,$file) = @_; + &Apache::lonxml::debug("Analyze"); + my $result; + my %overall; + my %allparts; + 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'}, + '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 $subresult=&Apache::lonnet::ssi($request->uri, + ('grade_target' => 'analyze'), + ('rndseed' => $i+$rndseed)); + (my $garbage,$subresult)=split(/_HASH_REF__/,$subresult,2); + my %analyze=&Apache::lonnet::str2hash($subresult); + my @parts; + if (defined(@{ $analyze{'parts'} })) { + @parts=@{ $analyze{'parts'} }; + } + foreach my $part (@parts) { + if (!exists($allparts{$part})) {$allparts{$part}=1;}; + if ($analyze{$part.'.type'} eq 'numericalresponse' || + $analyze{$part.'.type'} eq 'stringresponse' || + $analyze{$part.'.type'} eq 'formularesponse' ) { + push( @{ $overall{$part.'.answer'} }, + [@{ $analyze{$part.'.answer'} }]); + } + } } - my $fh=Apache::File->new(">$fileout"); - if (defined($fh)) { - print $fh $$result; - $request->print("Saving Modifications to $fileout
"); - } else { - $request->print("Unable to write to $fileout"); - $error|=4; + &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(''); + my %frequency; + foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) { + $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.'
'.&mt('Answer').''.&mt('Frequency').'
'. + join('',split("\0",$answer)). + '('.$frequency{$answer}. + ')
'); + } else { + $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.').'

'); } - } - return $error; + &Apache::lonhtmlcommon::Close_PrgWin($request,\%prog_state); + &analyze_footer($request); + &Apache::lonhomework::showhash(%overall); + return $result; } sub editxmlmode { - my ($request,$file) = @_; - my $result; - my $problem=&Apache::lonnet::getfile($file); - if ($problem == -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); } - } - my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem); - if ($cols > 80) { $cols = 80; } - $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=''; + if ($ENV{'environment.remote'} eq 'off') { + $bodytag=&Apache::loncommon::bodytag(); + } + $result.=''.$bodytag.&Apache::lonxml::message_location().'
- - - + &HTML::Entities::encode($ENV{'request.uri'},'<>&"').'">'. + &Apache::structuretags::remember_problem_state().' + + +
- - + + +
+ ' . $xml_help . ' + &HTML::Entities::encode($problem,'<>&"').'
'; - $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) = @_; - my (@targets) = &get_target(); - foreach my $target (@targets) { - #my $t0 = [&gettimeofday()]; - my $problem=&Apache::lonnet::getfile($file); - if ($problem == -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)); + 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 $problem=&Apache::lonnet::getfile($file); + if ($problem eq -1) { + &Apache::lonxml::error(" ".&mt('Unable to find')." $file"); + $problem=''; + } - my %mystyle; - my $result = ''; - &Apache::inputtags::initialize_inputtags; - &Apache::edit::initialize_edit; - if ($target eq 'web') { - if (&Apache::lonnet::symbread() eq '') { - if ($ENV{'request.state'} eq "construct") { + 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 { - $request->print("Browsing or ambiguous reference, submissions ignored
"); + 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(); } - } - #if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); } - } - #if ($target eq 'grade') { &showhash(%Apache::lonhomework::history); } - - my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm'); - if ($default == -1) { - &Apache::lonxml::error("Unable to find default_homework.lcpm"); - $default=''; + #$request->print(":Result ends"); + #my $td=&tv_interval($t0); } - $result = &Apache::lonxml::xmlparse($target, $problem, - $default.&setup_vars($target),%mystyle); - - #$request->print("Result follows:"); - if ($target eq 'modified') { - &handle_save_or_undo($request,\$problem,\$result); - } else { - #my $td=&tv_interval($t0); - #if ( $Apache::lonxml::debug) { - #$result =~ s:::; - #$result.="
Spent $td seconds processing target $target\n"; - #} - $request->print($result); - } - #$request->print(":Result ends"); - #my $td=&tv_interval($t0); - } + &Apache::lonxml::add_messages(\$overall_result); + $request->print($overall_result); + $request->rflush(); } # with no arg it returns a HTML "; + my ($namewanted,$extension) = @_; + my $result; + my @allnames; + &Apache::lonxml::debug("Looking for :$extension:"); + foreach my $file () { + my $name=&Apache::lonnet::metadata($file,'title'); + if ($namewanted && ($name eq $namewanted)) { + $result=$file; + last; + } else { + if ($name) { push (@allnames, $name); } + } + } + if (@allnames && !$result) { + $result="\n'; } - } - return $result; + return $result; } sub newproblem { - my ($request) = @_; - - my $extension=$request->uri; - $extension=~s:^.*\.([\w]+)$:$1:; - &Apache::lonxml::debug("Looking for :$extension:"); - if ($ENV{'form.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,$file); - } else { + my ($request) = @_; + my $extension=$request->uri; + $extension=~s:^.*\.([\w]+)$:$1:; + &Apache::lonxml::debug("Looking for :$extension:"); my $templatelist=&get_template_list('',$extension); - my $url=$request->uri; - my $dest = &Apache::lonnet::filelocation("",$request->uri); - $request->print(< -The request file $url doesn\'t exist. You can create a new $extension
-
-
- -
- + 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 $dest = &Apache::lonnet::filelocation("",$request->uri); + copy($file,$dest); + &renderpage($request,$dest); + } elsif($ENV{'form.newfile'} && !$templatelist) { + # I don't like hard-coded filenames but for now, this will work. + use File::Copy; + 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 $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='

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

'."\n"; + } + my $instructions; + 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(<$lt{'create'} $extension $lt{'resource'} +$errormsg +$lt{'requested'} $shownurl $lt{'not exist'}. +

+$lt{'createnew'} $extension$instructions $lt{'click'} "$lt{'Create'} $extension" $lt{'button'}. +

+

ENDNEWPROBLEM - } - - return ''; + if (defined($templatelist)) { + $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]; - - if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} - - if (&setupheader($request)) { return OK; } - $ENV{'request.uri'}=$request->uri; + #my $t0 = [&gettimeofday()]; + my $request=$_[0]; + + $Apache::lonxml::debug=$ENV{'user.debug'}; + $ENV{'request.uri'}=$request->uri; + &setuppermissions(); + &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' && + $ENV{'request.state'} ne "construct") { + #should know where we are, so ask + if ( &Apache::lonnet::mod_perl_version() == 2 ) { + &Apache::lonnet::cleanenv(); + } + &Apache::lonnet::logthis(&Apache::lonnet::mod_perl_version()); + $request->internal_redirect('/adm/ambiguous'); return OK; + } + } + if (&setupheader($request)) { return OK; } - #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:"); - &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; - } - } - - if ($ENV{'request.state'} eq "construct") { - if ($ENV{'form.resetdata'} eq 'Reset Submissions') { - my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); - &Apache::lonnet::tmpreset($symb,'',$domain,$name); - } - 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); - } 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') || + $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 - &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; }