version 1.216, 2005/08/16 16:31:14
|
version 1.233.2.1, 2006/02/16 01:25:33
|
Line 94 sub get_target {
|
Line 94 sub get_target {
|
if ( defined($env{'form.submitted'}) && |
if ( defined($env{'form.submitted'}) && |
( !defined($env{'form.resetdata'})) && |
( !defined($env{'form.resetdata'})) && |
( !defined($env{'form.newrandomization'}))) { |
( !defined($env{'form.newrandomization'}))) { |
return ('grade', 'web','answer'); |
return ('grade', 'web'); |
} else { |
} else { |
return ('web','answer'); |
return ('web'); |
} |
} |
} elsif ($env{'request.state'} eq "construct") { |
} elsif ($env{'request.state'} eq "construct") { |
if ( defined($env{'form.grade_target'}) ) { |
if ( defined($env{'form.grade_target'}) ) { |
Line 166 sub send_footer {
|
Line 166 sub send_footer {
|
} |
} |
|
|
sub proctor_checked_in { |
sub proctor_checked_in { |
my ($slot_name,$slot)=@_; |
my ($slot_name,$slot,$type)=@_; |
my @allowed=split(",",$slot->{'proctor'}); |
my @possible_proctors=split(",",$slot->{'proctor'}); |
my $version=$Apache::lonhomework::history{'resource.version'}; |
|
foreach my $possible (@allowed) { |
my $key; |
if ($Apache::lonhomework::history{"resource.$version.checkedin"} eq |
if ($type eq 'Task') { |
$possible && |
my $version=$Apache::lonhomework::history{'resource.0.version'}; |
$Apache::lonhomework::history{"resource.$version.checkedin.slot"} |
$key ="resource.$version.0.checkedin"; |
eq $slot_name) { |
} 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 1; |
} |
} |
} |
} |
|
|
return 0; |
return 0; |
} |
} |
|
|
$Apache::lonxml::browse=''; |
$Apache::lonxml::browse=''; |
sub check_ip_acc { |
sub check_ip_acc { |
my ($acc)=@_; |
my ($acc)=@_; |
if (!defined($acc) || $acc =~ /^\s*$/) { return 1; } |
&Apache::lonxml::debug("acc is $acc"); |
|
if (!defined($acc) || $acc =~ /^\s*$/ || $acc =~/^\s*no\s*$/i) { |
|
return 1; |
|
} |
my $allowed=0; |
my $allowed=0; |
my $ip=$ENV{'REMOTE_ADDR'}; |
my $ip=$ENV{'REMOTE_ADDR'}; |
my $name; |
my $name; |
foreach my $pattern (split(',',$acc)) { |
foreach my $pattern (split(',',$acc)) { |
|
$pattern =~ s/^\s*//; |
|
$pattern =~ s/\s*$//; |
if ($pattern =~ /\*$/) { |
if ($pattern =~ /\*$/) { |
#35.8.* |
#35.8.* |
$pattern=~s/\*//; |
$pattern=~s/\*//; |
Line 227 sub check_ip_acc {
|
Line 239 sub check_ip_acc {
|
return $allowed; |
return $allowed; |
} |
} |
|
|
sub check_task_access { |
sub check_slot_access { |
|
my ($id,$type)=@_; |
|
|
# does it pass normal muster |
# does it pass normal muster |
# yes we really do want the default args passing |
my ($status,$datemsg)=&check_access($id); |
my ($status,$datemsg)=&check_access; |
|
|
my $useslots = &Apache::lonnet::EXT("resource.$id.useslots"); |
|
if ($useslots ne 'resource') { |
|
return ($status,$datemsg); |
|
} |
|
|
if ($status eq 'SHOW_ANSWER' || |
if ($status eq 'SHOW_ANSWER' || |
$status eq 'CLOSED' || |
$status eq 'CLOSED' || |
$status eq 'CANNOT_ANSWER' || |
|
$status eq 'INVALID_ACCESS' || |
$status eq 'INVALID_ACCESS' || |
$status eq 'UNAVAILABLE') { |
$status eq 'UNAVAILABLE') { |
return ($status,$datemsg); |
return ($status,$datemsg); |
Line 241 sub check_task_access {
|
Line 259 sub check_task_access {
|
if ($env{'request.state'} eq "construct") { |
if ($env{'request.state'} eq "construct") { |
return ($status,$datemsg); |
return ($status,$datemsg); |
} |
} |
my $version=$Apache::lonhomework::history{'resource.version'}; |
|
if ($Apache::lonhomework::history{"resource.$version.checkedin"} && |
if ($type eq 'Task') { |
$Apache::lonhomework::history{"resource.$version.status"} eq 'pass') { |
my $version=$Apache::lonhomework::history{'resource.version'}; |
return ('SHOW_ANSWER'); |
if ($Apache::lonhomework::history{"resource.$version.0.checkedin"} && |
|
$Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') { |
|
return ('SHOW_ANSWER'); |
|
} |
} |
} |
my ($id)=@_; |
|
my @slots= |
my @slots= |
(split(':',&Apache::lonnet::EXT("resource.$id.availablestudent")), |
(split(':',&Apache::lonnet::EXT("resource.$id.availablestudent")), |
split(':',&Apache::lonnet::EXT("resource.$id.available"))); |
split(':',&Apache::lonnet::EXT("resource.$id.available"))); |
Line 271 sub check_task_access {
|
Line 292 sub check_task_access {
|
} |
} |
} |
} |
if ($slotstatus eq 'NEEDS_CHECKIN' && |
if ($slotstatus eq 'NEEDS_CHECKIN' && |
&proctor_checked_in($slot_name,$returned_slot)) { |
&proctor_checked_in($slot_name,$returned_slot,$type)) { |
&Apache::lonxml::debug("protoctor checked in"); |
&Apache::lonxml::debug("protoctor checked in"); |
$slotstatus='CAN_ANSWER'; |
$slotstatus='CAN_ANSWER'; |
} |
} |
if ( $slotstatus eq 'NOT_IN_A_SLOT' && |
|
$Apache::lonhomework::history{"resource.$version.checkedin"}) { |
my ($is_correct,$got_grade,$checkedin); |
if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') { |
if ($type eq 'Task') { |
|
my $version=$Apache::lonhomework::history{'resource.0.version'}; |
|
$got_grade = |
|
($Apache::lonhomework::history{"resource.$version.0.status"} |
|
=~ /^(?:pass|fail)$/); |
|
$is_correct = |
|
($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' |
|
|| $Apache::lonhomework::history{"resource.0.solved"} =~ /^correct_/ ); |
|
$checkedin = |
|
$Apache::lonhomework::history{"resource.$version.0.checkedin"}; |
|
} elsif ($type eq 'problem') { |
|
$got_grade = 1; |
|
$checkedin = $Apache::lonhomework::history{"resource.0.checkedin"}; |
|
} |
|
|
|
&Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)"); |
|
|
|
if ($slotstatus eq 'NOT_IN_A_SLOT' |
|
&& $checkedin ) { |
|
|
|
if ($got_grade) { |
return ('SHOW_ANSWER'); |
return ('SHOW_ANSWER'); |
} else { |
} else { |
return ('WAITING_FOR_GRADE'); |
return ('WAITING_FOR_GRADE'); |
} |
} |
|
|
|
} |
|
if ( $is_correct) { |
|
return ('SHOW_ANSWER'); |
|
} |
|
if ( $status eq 'CANNOT_ANSWER' && |
|
($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT')) { |
|
return ($status,$datemsg); |
} |
} |
|
|
return ($slotstatus,$datemsg,$slot_name,$returned_slot); |
return ($slotstatus,$datemsg,$slot_name,$returned_slot); |
} |
} |
|
|
Line 294 sub check_access {
|
Line 344 sub check_access {
|
my $status; |
my $status; |
my $datemsg = ''; |
my $datemsg = ''; |
my $lastdate = ''; |
my $lastdate = ''; |
my $temp; |
|
my $type; |
my $type; |
my $passed; |
my $passed; |
|
|
Line 331 sub check_access {
|
Line 380 sub check_access {
|
return($status,$date); |
return($status,$date); |
} |
} |
|
|
foreach $temp ("opendate","duedate","answerdate") { |
foreach my $temp ("opendate","duedate","answerdate") { |
$lastdate = $date; |
$lastdate = $date; |
$date = &Apache::lonnet::EXT("resource.$id.$temp"); |
$date = &Apache::lonnet::EXT("resource.$id.$temp"); |
my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type"); |
my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type"); |
Line 578 sub handle_save_or_undo {
|
Line 627 sub handle_save_or_undo {
|
|
|
sub analyze_header { |
sub analyze_header { |
my ($request) = @_; |
my ($request) = @_; |
my $bodytag='<body bgcolor="#ffffff">'; |
my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef, |
if ($env{'environment.remote'} eq 'off') { |
($env{'environment.remote'} ne 'off')); |
$bodytag=&Apache::loncommon::bodytag(); |
|
} |
|
my $html=&Apache::lonxml::xmlbegin(); |
my $html=&Apache::lonxml::xmlbegin(); |
my $result.=$html.' |
my $result.=$html.' |
<head><title>'.&mt("Analyzing a problem").'</title></head> |
<head><title>'.&mt("Analyzing a problem").'</title></head> |
Line 612 sub analyze {
|
Line 659 sub analyze {
|
&Apache::lonxml::debug("Analyze"); |
&Apache::lonxml::debug("Analyze"); |
my $result; |
my $result; |
my %overall; |
my %overall; |
|
my %seedexample; |
my %allparts; |
my %allparts; |
my $rndseed=$env{'form.rndseed'}; |
my $rndseed=$env{'form.rndseed'}; |
&analyze_header($request); |
&analyze_header($request); |
Line 624 sub analyze {
|
Line 672 sub analyze {
|
&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; } |
if (&Apache::loncommon::connection_aborted($request)) { return; } |
|
my $thisseed=$i+$rndseed; |
my $subresult=&Apache::lonnet::ssi($request->uri, |
my $subresult=&Apache::lonnet::ssi($request->uri, |
('grade_target' => 'analyze'), |
('grade_target' => 'analyze'), |
('rndseed' => $i+$rndseed)); |
('rndseed' => $thisseed)); |
(my $garbage,$subresult)=split(/_HASH_REF__/,$subresult,2); |
(my $garbage,$subresult)=split(/_HASH_REF__/,$subresult,2); |
my %analyze=&Apache::lonnet::str2hash($subresult); |
my %analyze=&Apache::lonnet::str2hash($subresult); |
my @parts; |
my @parts; |
Line 638 sub analyze {
|
Line 687 sub analyze {
|
if ($analyze{$part.'.type'} eq 'numericalresponse' || |
if ($analyze{$part.'.type'} eq 'numericalresponse' || |
$analyze{$part.'.type'} eq 'stringresponse' || |
$analyze{$part.'.type'} eq 'stringresponse' || |
$analyze{$part.'.type'} eq 'formularesponse' ) { |
$analyze{$part.'.type'} eq 'formularesponse' ) { |
|
my $concatanswer=join("\0",@{ $analyze{$part.'.answer'} }); |
|
if (($concatanswer eq '') || ($concatanswer=~/^\@/)) { |
|
@{$analyze{$part.'.answer'}}=('<font color="red">'.&mt('Error').'</font>'); |
|
} |
push( @{ $overall{$part.'.answer'} }, |
push( @{ $overall{$part.'.answer'} }, |
[@{ $analyze{$part.'.answer'} }]); |
[@{ $analyze{$part.'.answer'} }]); |
|
$seedexample{join("\0",@{ $analyze{$part.'.answer'}})}=$thisseed; |
} |
} |
} |
} |
} |
} |
Line 649 sub analyze {
|
Line 703 sub analyze {
|
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><th colspan="'.($num_cols+1).'">'.&mt('Part').' '.$part.'</th></tr>'); |
$request->print('<table class="thinborder"><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><th colspan="'.($num_cols).'">'.&mt('Answer').'</th><th>'.&mt('Frequency').'</th></tr>'); |
$request->print('<tr><th colspan="'.($num_cols).'">'.&mt('Answer').'</th><th>'.&mt('Frequency').'<br />(' |
|
.&mt('click for example').')</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 class="center">'. |
join('</td><td align="right">',split("\0",$answer)). |
join('</td><td class="center">',split("\0",$answer)). |
'</td><td>('.$frequency{$answer}. |
'</td><td class="center"><a href="'.$request->uri.'?rndseed='.$seedexample{$answer}.'">'.$frequency{$answer}. |
')</td></tr>'); |
'</a></td></tr>'); |
} |
} |
$request->print('</table>'); |
$request->print('</table>'); |
} else { |
} else { |
Line 706 sub editxmlmode {
|
Line 761 sub editxmlmode {
|
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; } |
my $bodytag='<body bgcolor="#ffffff">'; |
my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef, |
if ($env{'environment.remote'} eq 'off') { |
($env{'environment.remote'} ne 'off')); |
$bodytag=&Apache::loncommon::bodytag(); |
|
} |
|
my $html=&Apache::lonxml::xmlbegin(); |
my $html=&Apache::lonxml::xmlbegin(); |
$result.=$html.$bodytag. |
my $head="<head><title>EditXML $file</title>". |
|
&Apache::edit::js_change_detection()."</head>"; |
|
|
|
$result.=$html.$head.$bodytag. |
&renderpage($request,$file,['no_output_web'],1). |
&renderpage($request,$file,['no_output_web'],1). |
&Apache::lonxml::message_location().' |
&Apache::lonxml::message_location().' |
<form name="lonhomework" method="POST" action="'. |
<form '.&Apache::edit::form_change_detection().' name="lonhomework" method="POST" action="'. |
&HTML::Entities::encode($env{'request.uri'},'<>&"').'">'. |
&HTML::Entities::encode($env{'request.uri'},'<>&"').'">'. |
&Apache::structuretags::remember_problem_state().' |
&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" '.&Apache::edit::submit_ask_anyway().'name="problemmode" accesskey="e" value="'.&mt('Edit').'" /> |
|
<input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> |
<hr /> |
<hr /> |
<input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" /> |
<input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" /> |
<input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /> |
<input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /> |
<input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> |
|
<hr /> |
<hr /> |
' . $xml_help . ' |
' . $xml_help . ' |
<textarea style="width:100%" rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'. |
<textarea '.&Apache::edit::element_change_detection().' style="width:100%" rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'. |
&HTML::Entities::encode($problem,'<>&"').'</textarea> |
&HTML::Entities::encode($problem,'<>&"').'</textarea><br /> |
|
<input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" /> |
|
<input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /> |
</form></body></html>'; |
</form></body></html>'; |
&Apache::lonxml::add_messages(\$result); |
&Apache::lonxml::add_messages(\$result); |
$request->print($result); |
$request->print($result); |
Line 759 sub renderpage {
|
Line 817 sub renderpage {
|
$target = 'web'; $output=0; |
$target = 'web'; $output=0; |
} |
} |
my $problem=&Apache::lonnet::getfile($file); |
my $problem=&Apache::lonnet::getfile($file); |
|
my $result; |
if ($problem eq -1) { |
if ($problem eq -1) { |
&Apache::lonxml::error("<b> ".&mt('Unable to find')." <i>$file</i></b>"); |
my $filename=(split('/',$file))[-1]; |
|
$result.="<b> ".&mt('Unable to find')." <i>$filename</i></b>"; |
$problem=''; |
$problem=''; |
} |
} |
|
|
Line 770 sub renderpage {
|
Line 830 sub renderpage {
|
if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%env,'^form');} |
if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%env,'^form');} |
|
|
&Apache::lonxml::debug("Should be parsing now"); |
&Apache::lonxml::debug("Should be parsing now"); |
my $result = &Apache::lonxml::xmlparse($request, $target, $problem, |
$result .= &Apache::lonxml::xmlparse($request, $target, $problem, |
&setup_vars($target),%mystyle); |
&setup_vars($target),%mystyle); |
undef($Apache::lonhomework::parsing_a_problem); |
undef($Apache::lonhomework::parsing_a_problem); |
if (!$output) { $result = ''; } |
if (!$output) { $result = ''; } |
#$request->print("Result follows:"); |
#$request->print("Result follows:"); |
Line 910 EDITMENU
|
Line 970 EDITMENU
|
sub handler { |
sub handler { |
#my $t0 = [&gettimeofday()]; |
#my $t0 = [&gettimeofday()]; |
my $request=$_[0]; |
my $request=$_[0]; |
|
$Apache::lonxml::request=$request; |
$Apache::lonxml::debug=$env{'user.debug'}; |
$Apache::lonxml::debug=$env{'user.debug'}; |
$env{'request.uri'}=$request->uri; |
$env{'request.uri'}=$request->uri; |
&setuppermissions(); |
&setuppermissions(); |
Line 930 sub handler {
|
Line 990 sub handler {
|
if ($Apache::lonhomework::browse ne 'F' && |
if ($Apache::lonhomework::browse ne 'F' && |
$env{'request.state'} ne "construct") { |
$env{'request.state'} ne "construct") { |
#should know where we are, so ask |
#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; |
$request->internal_redirect('/adm/ambiguous'); return OK; |
} |
} |
} |
} |