version 1.174, 2004/04/17 14:06:41
|
version 1.190, 2004/12/22 22:05:40
|
Line 52 use Apache::Constants qw(:common);
|
Line 52 use Apache::Constants qw(:common);
|
use HTML::Entities(); |
use HTML::Entities(); |
use Apache::loncommon(); |
use Apache::loncommon(); |
use Apache::lonlocal; |
use Apache::lonlocal; |
#use Time::HiRes qw( gettimeofday tv_interval ); |
use Time::HiRes qw( gettimeofday tv_interval ); |
|
use Apache::lonnet(); |
|
|
|
# FIXME - improve commenting |
|
|
|
|
BEGIN { |
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 { |
sub get_target { |
|
&Apache::lonxml::debug("request.state = $ENV{'request.state'}"); |
|
if( defined($ENV{'form.grade_target'})) { |
|
&Apache::lonxml::debug("form.grade_target= $ENV{'form.grade_target'}"); |
|
} else { |
|
&Apache::lonxml::debug("form.grade_target <undefined>"); |
|
} |
if (($ENV{'request.state'} eq "published") || |
if (($ENV{'request.state'} eq "published") || |
($ENV{'request.state'} eq "uploaded")) { |
($ENV{'request.state'} eq "uploaded")) { |
if ( defined($ENV{'form.grade_target'} ) |
if ( defined($ENV{'form.grade_target'} ) |
Line 96 sub get_target {
|
Line 115 sub get_target {
|
} else { |
} else { |
return ('web','answer'); |
return ('web','answer'); |
} |
} |
} elsif ( $ENV{'form.problemmode'} eq &mt('Edit') ) { |
} elsif ( $ENV{'form.problemmode'} eq &mt('Edit') || |
|
$ENV{'form.problemmode'} ee 'Edit') { |
if ( $ENV{'form.submitted'} eq 'edit' ) { |
if ( $ENV{'form.submitted'} eq 'edit' ) { |
if ( $ENV{'form.submit'} eq &mt('Submit Changes and View') ) { |
if ( $ENV{'form.submit'} eq &mt('Submit Changes and View') ) { |
return ('modified','web','answer'); |
return ('modified','web','answer'); |
Line 292 sub check_access {
|
Line 312 sub check_access {
|
$status = 'CANNOT_ANSWER'; |
$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') && |
#if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') && |
# (!$Apache::lonhomework::history{"resource.0.outtoken"})) { |
# (!$Apache::lonhomework::history{"resource.0.outtoken"})) { |
# return ('UNCHECKEDOUT','needs to be checked out'); |
# return ('UNCHECKEDOUT','needs to be checked out'); |
Line 365 sub setuppermissions {
|
Line 404 sub setuppermissions {
|
$viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}. |
$viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}. |
'/'.$ENV{'request.course.sec'}); |
'/'.$ENV{'request.course.sec'}); |
} |
} |
$Apache::lonhomework::viewgrades = $viewgrades; |
$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 '' |
return '' |
} |
} |
|
|
Line 430 sub handle_save_or_undo {
|
Line 475 sub handle_save_or_undo {
|
|
|
sub analyze_header { |
sub analyze_header { |
my ($request) = @_; |
my ($request) = @_; |
|
my $bodytag='<body bgcolor="#ffffff">'; |
|
if ($ENV{'environment.remote'} eq 'off') { |
|
$bodytag=&Apache::loncommon::bodytag(); |
|
} |
my $result.='<html> |
my $result.='<html> |
<head><title>'.&mt("Analyzing a problem").'</title></head> |
<head><title>'.&mt("Analyzing a problem").'</title></head> |
<body bgcolor="#FFFFFF">'.&Apache::lonxml::message_location().' |
'.$bodytag.&Apache::lonxml::message_location().' |
<form name="lonhomework" method="POST" action="'. |
<form name="lonhomework" method="POST" action="'. |
$ENV{'request.uri'}.'"> |
&HTML::Entities::encode($ENV{'request.uri'},'<>&"').'">'. |
|
&Apache::structuretags::remember_problem_state().' |
<input type="submit" name="problemmode" value="'.&mt("EditXML").'" /> |
<input type="submit" name="problemmode" value="'.&mt("EditXML").'" /> |
<input type="submit" name="problemmode" value="'.&mt('Edit').'" /> |
<input type="submit" name="problemmode" value="'.&mt('Edit').'" /> |
<hr /> |
<hr /> |
<input type="submit" name="submit" value="'.&mt("View").'" /> |
<input type="submit" name="submit" value="'.&mt("View").'" /> |
<hr /> |
<hr /> |
'.&mt('List of possible answers').': |
|
</form>'; |
</form>'; |
&Apache::lonxml::add_messages(\$result); |
&Apache::lonxml::add_messages(\$result); |
$request->print($result); |
$request->print($result); |
Line 465 sub analyze {
|
Line 514 sub analyze {
|
my %prog_state= |
my %prog_state= |
&Apache::lonhtmlcommon::Create_PrgWin($request,&mt('Analyze Progress'), |
&Apache::lonhtmlcommon::Create_PrgWin($request,&mt('Analyze Progress'), |
&mt('Getting Problem Variants'), |
&mt('Getting Problem Variants'), |
$ENV{'form.numtoanalyze'}); |
$ENV{'form.numtoanalyze'}, |
|
'inline',undef); |
for(my $i=1;$i<$ENV{'form.numtoanalyze'}+1;$i++) { |
for(my $i=1;$i<$ENV{'form.numtoanalyze'}+1;$i++) { |
&Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state, |
&Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state, |
&mt('last problem')); |
&mt('last problem')); |
|
if (&Apache::loncommon::connection_aborted($request)) { return; } |
my $subresult=&Apache::lonnet::ssi($request->uri, |
my $subresult=&Apache::lonnet::ssi($request->uri, |
('grade_target' => 'analyze'), |
('grade_target' => 'analyze'), |
('rndseed' => $i+$rndseed)); |
('rndseed' => $i+$rndseed)); |
Line 490 sub analyze {
|
Line 541 sub analyze {
|
} |
} |
&Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state, |
&Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state, |
&mt('Analyzing Results')); |
&mt('Analyzing Results')); |
|
$request->print('<hr />'.&mt('List of possible answers').': '); |
foreach my $part (sort(keys(%allparts))) { |
foreach my $part (sort(keys(%allparts))) { |
if (defined(@{ $overall{$part.'.answer'} })) { |
if (defined(@{ $overall{$part.'.answer'} })) { |
my $num_cols=scalar(@{ $overall{$part.'.answer'}->[0] }); |
my $num_cols=scalar(@{ $overall{$part.'.answer'}->[0] }); |
$request->print('<table><tr><td colspan="'.($num_cols+1).'">'.&mt('Part').' '.$part.'</td></tr>'); |
$request->print('<table><tr><th colspan="'.($num_cols+1).'">'.&mt('Part').' '.$part.'</th></tr>'); |
my %frequency; |
my %frequency; |
foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) { |
foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) { |
$frequency{join("\0",@{ $answer })}++; |
$frequency{join("\0",@{ $answer })}++; |
} |
} |
$request->print('<tr><td colspan="'.($num_cols).'">'.&mt('Answer').'</td><td>'.&mt('Frequency').'</td></tr>'); |
$request->print('<tr><th colspan="'.($num_cols).'">'.&mt('Answer').'</th><th>'.&mt('Frequency').'</th></tr>'); |
foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) { |
foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) { |
$request->print('<tr><td align="right">'. |
$request->print('<tr><td align="right">'. |
join('</td><td align="right">',split("\0",$answer)). |
join('</td><td align="right">',split("\0",$answer)). |
Line 545 sub editxmlmode {
|
Line 597 sub editxmlmode {
|
&Apache::loncommon::helpLatexCheatsheet("Problem_Editor_XML_Index", |
&Apache::loncommon::helpLatexCheatsheet("Problem_Editor_XML_Index", |
"Problem Editing Help"). |
"Problem Editing Help"). |
'</td><td>'. |
'</td><td>'. |
&Apache::loncommon::help_open_faq(5). |
&Apache::loncommon::help_open_menu('',undef,undef,undef,5,'Authoring'). |
&Apache::loncommon::help_open_bug('Authoring').'</td></tr></table>'; |
'</td></tr></table>'; |
if ($cols > 80) { $cols = 80; } |
if ($cols > 80) { $cols = 80; } |
if ($cols < 70) { $cols = 70; } |
if ($cols < 70) { $cols = 70; } |
if ($rows < 20) { $rows = 20; } |
if ($rows < 20) { $rows = 20; } |
$result.='<html><body bgcolor="#FFFFFF">'. |
my $bodytag='<body bgcolor="#ffffff">'; |
&Apache::lonxml::message_location().' |
if ($ENV{'environment.remote'} eq 'off') { |
|
$bodytag=&Apache::loncommon::bodytag(); |
|
} |
|
$result.='<html>'.$bodytag.&Apache::lonxml::message_location().' |
<form name="lonhomework" method="POST" action="'. |
<form name="lonhomework" method="POST" action="'. |
$ENV{'request.uri'}.'"> |
&HTML::Entities::encode($ENV{'request.uri'},'<>&"').'">'. |
|
&Apache::structuretags::remember_problem_state().' |
<input type="hidden" name="problemmode" value="'.&mt('EditXML').'" /> |
<input type="hidden" name="problemmode" value="'.&mt('EditXML').'" /> |
<input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" /> |
<input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" /> |
<input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" /> |
<input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" /> |
Line 572 sub editxmlmode {
|
Line 628 sub editxmlmode {
|
return ''; |
return ''; |
} |
} |
|
|
|
# |
|
# Render the page in whatever target desired. |
|
# |
sub renderpage { |
sub renderpage { |
my ($request,$file) = @_; |
my ($request,$file) = @_; |
|
|
Line 580 sub renderpage {
|
Line 639 sub renderpage {
|
&Apache::lonxml::debug("Running targets ".join(':',@targets)); |
&Apache::lonxml::debug("Running targets ".join(':',@targets)); |
my $overall_result; |
my $overall_result; |
foreach my $target (@targets) { |
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 $t0 = [&gettimeofday()]; |
my $problem=&Apache::lonnet::getfile($file); |
my $problem=&Apache::lonnet::getfile($file); |
if ($problem eq -1) { |
if ($problem eq -1) { |
Line 668 sub newproblem {
|
Line 734 sub newproblem {
|
copy($templatefilename,$dest); |
copy($templatefilename,$dest); |
&renderpage($request,$dest); |
&renderpage($request,$dest); |
} else { |
} else { |
my $url=$request->uri; |
my $url=&HTML::Entities::encode($request->uri,'<>&"'); |
my $shownurl=$url; |
my $shownurl=$url; |
$shownurl=~s-^/~-/priv/-; |
$shownurl=~s-^/~-/priv/-; |
my $dest = &Apache::lonnet::filelocation("",$request->uri); |
my $dest = &Apache::lonnet::filelocation("",$request->uri); |
my $errormsg; |
my $errormsg; |
Line 677 sub newproblem {
|
Line 743 sub newproblem {
|
$errormsg='<p><font color="red">'.&mt('You did not select a template.').'</font></p>'."\n"; |
$errormsg='<p><font color="red">'.&mt('You did not select a template.').'</font></p>'."\n"; |
} |
} |
my $instructions; |
my $instructions; |
my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1); |
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.").'<br />'.&mt("Then");} |
if ($templatelist) { $instructions=&mt(", select a template from the pull-down menu below.").'<br />'.&mt("Then");} |
my %lt=&Apache::lonlocal::texthash( 'create' => 'Creating a new', |
my %lt=&Apache::lonlocal::texthash( 'create' => 'Creating a new', |
'resource' => 'resource', |
'resource' => 'resource', |
Line 708 ENDNEWPROBLEM
|
Line 775 ENDNEWPROBLEM
|
|
|
sub view_or_edit_menu { |
sub view_or_edit_menu { |
my ($request) = @_; |
my ($request) = @_; |
my $url=$request->uri; |
my $url=&HTML::Entities::encode($request->uri,'<>&"'); |
my %lt=&Apache::lonlocal::texthash( 'would' => 'Would you like to', |
my %lt=&Apache::lonlocal::texthash( 'would' => 'Would you like to', |
'view' => 'View', |
'view' => 'View', |
'Edit' => 'edit', |
'Edit' => 'edit', |
Line 730 sub handler {
|
Line 797 sub handler {
|
my $request=$_[0]; |
my $request=$_[0]; |
|
|
$Apache::lonxml::debug=$ENV{'user.debug'}; |
$Apache::lonxml::debug=$ENV{'user.debug'}; |
if (&setupheader($request)) { return OK; } |
|
$ENV{'request.uri'}=$request->uri; |
$ENV{'request.uri'}=$request->uri; |
|
&setuppermissions(); |
#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("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:"); |
# some times multiple problemmodes are submitted, need to select |
# some times multiple problemmodes are submitted, need to select |
# the last one |
# the last one |
Line 759 sub handler {
|
Line 822 sub handler {
|
if ( &Apache::lonnet::mod_perl_version() == 2 ) { |
if ( &Apache::lonnet::mod_perl_version() == 2 ) { |
&Apache::lonnet::cleanenv(); |
&Apache::lonnet::cleanenv(); |
} |
} |
$request->internal_redirect('/adm/ambiguous'); return; |
&Apache::lonnet::logthis(&Apache::lonnet::mod_perl_version()); |
|
$request->internal_redirect('/adm/ambiguous'); return OK; |
} |
} |
} |
} |
|
if (&setupheader($request)) { return OK; } |
|
|
my ($symb) = &Apache::lonxml::whichuser(); |
my ($symb) = &Apache::lonxml::whichuser(); |
&Apache::lonxml::debug('symb is '.$symb); |
&Apache::lonxml::debug('symb is '.$symb); |
Line 783 sub handler {
|
Line 848 sub handler {
|
#&view_or_edit_menu($request); |
#&view_or_edit_menu($request); |
$ENV{'form.problemmode'}='View'; |
$ENV{'form.problemmode'}='View'; |
&renderpage($request,$file); |
&renderpage($request,$file); |
} elsif ($ENV{'form.problemmode'} eq &mt('EditXML')) { |
} elsif ($ENV{'form.problemmode'} eq &mt('EditXML') || |
|
$ENV{'form.problemmode'} eq 'EditXML' { |
&editxmlmode($request,$file); |
&editxmlmode($request,$file); |
} elsif ($ENV{'form.problemmode'} eq &mt('Calculate answers')) { |
} elsif ($ENV{'form.problemmode'} eq &mt('Calculate answers')) { |
&analyze($request,$file); |
&analyze($request,$file); |