version 1.127, 2003/05/14 17:16:20
|
version 1.138.2.1, 2003/10/15 22:18:26
|
Line 50 use Apache::essayresponse();
|
Line 50 use Apache::essayresponse();
|
use Apache::externalresponse(); |
use Apache::externalresponse(); |
use Apache::rankresponse(); |
use Apache::rankresponse(); |
use Apache::matchresponse(); |
use Apache::matchresponse(); |
#use Apache::chemresponse(); |
use Apache::chemresponse(); |
use Apache::Constants qw(:common); |
use Apache::Constants qw(:common); |
use HTML::Entities(); |
use HTML::Entities(); |
use Apache::loncommon(); |
use Apache::loncommon(); |
Line 72 sub get_target {
|
Line 72 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'}))) { |
return ('grade', 'web'); |
return ('grade', 'web'); |
} else { |
} else { |
return ('web'); |
return ('web'); |
Line 91 sub get_target {
|
Line 92 sub get_target {
|
if ( $ENV{'form.problemmode'} eq 'View' || |
if ( $ENV{'form.problemmode'} eq 'View' || |
$ENV{'form.problemmode'} eq 'Discard Edits and View') { |
$ENV{'form.problemmode'} eq 'Discard Edits and View') { |
if ( defined($ENV{'form.submitted'}) && |
if ( defined($ENV{'form.submitted'}) && |
(!defined($ENV{'form.resetdata'})) ) { |
(!defined($ENV{'form.resetdata'})) && |
|
(!defined($ENV{'form.newrandomization'}))) { |
return ('grade', 'web','answer'); |
return ('grade', 'web','answer'); |
} else { |
} else { |
return ('web','answer'); |
return ('web','answer'); |
Line 144 sub send_footer {
|
Line 146 sub send_footer {
|
|
|
$Apache::lonxml::browse=''; |
$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 |
# JB, 9/24/2002: Any changes in this function may require a change |
# in lonnavmaps::resource::getDateStatus. |
# in lonnavmaps::resource::getDateStatus. |
sub check_access { |
sub check_access { |
Line 165 sub check_access {
|
Line 212 sub check_access {
|
|
|
&Apache::lonxml::debug("checking for part :$id:"); |
&Apache::lonxml::debug("checking for part :$id:"); |
&Apache::lonxml::debug("time:".time); |
&Apache::lonxml::debug("time:".time); |
|
|
|
my $allowed=&check_ip_acc(&Apache::lonnet::EXT("resource.$id.acc")); |
|
if (!$allowed) { |
|
$status='INVALID_ACCESS'; |
|
$date=&mt("can not be accessed from your location."); |
|
return($status,$date); |
|
} |
|
|
foreach $temp ("opendate","duedate","answerdate") { |
foreach $temp ("opendate","duedate","answerdate") { |
$lastdate = $date; |
$lastdate = $date; |
$date = &Apache::lonnet::EXT("resource.$id.$temp"); |
$date = &Apache::lonnet::EXT("resource.$id.$temp"); |
Line 214 sub check_access {
|
Line 269 sub check_access {
|
my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); |
my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); |
if ( $tries eq '' ) { $tries = '0'; } |
if ( $tries eq '' ) { $tries = '0'; } |
if ( $maxtries eq '' ) { $maxtries = '2'; } |
if ( $maxtries eq '' ) { $maxtries = '2'; } |
if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } |
if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } |
if($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/ |
# if (correct and show prob status) or excused then CANNOT_ANSWER |
&& lc($Apache::lonhomework::problemstatus) ne 'no') { |
if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/ |
|
&& |
|
lc($Apache::lonhomework::problemstatus) ne 'no') |
|
|| |
|
$Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) { |
$status = 'CANNOT_ANSWER'; |
$status = 'CANNOT_ANSWER'; |
} |
} |
} |
} |
|
|
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'); |
} |
#} |
|
|
|
|
&Apache::lonxml::debug("sending back :$status:$datemsg:"); |
&Apache::lonxml::debug("sending back :$status:$datemsg:"); |
Line 394 sub analyze {
|
Line 453 sub analyze {
|
'last problem'); |
'last problem'); |
my $subresult=&Apache::lonnet::ssi($request->uri, |
my $subresult=&Apache::lonnet::ssi($request->uri, |
('grade_target' => 'analyze'), |
('grade_target' => 'analyze'), |
('rndseed' => $i)); |
('rndseed' => $i+$rndseed)); |
&Apache::lonxml::debug(":$subresult:"); |
|
(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 414 sub analyze {
|
Line 472 sub analyze {
|
} |
} |
&Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state, |
&Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state, |
'Analyzing Results'); |
'Analyzing Results'); |
foreach my $part (keys(%allparts)) { |
foreach my $part (sort(keys(%allparts))) { |
if (defined(@{ $overall{$part.'.answer'} })) { |
if (defined(@{ $overall{$part.'.answer'} })) { |
$request->print('<table><tr><td>Part '.$part.'</td></tr>'); |
my $num_cols=scalar(@{ $overall{$part.'.answer'}->[0] }); |
|
$request->print('<table><tr><td colspan="'.($num_cols+1).'">Part '.$part.'</td></tr>'); |
|
my %frequency; |
foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) { |
foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) { |
$request->print('<tr><td>'.join('</td><td>',@{ $answer }). |
$frequency{join("\0",@{ $answer })}++; |
'</td></tr>'); |
} |
|
$request->print('<tr><td colspan="'.($num_cols).'">Answer</td><td>Frequency</td></tr>'); |
|
foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) { |
|
$request->print('<tr><td align="right">'. |
|
join('</td><td align="right">',split("\0",$answer)). |
|
'</td><td>('.$frequency{$answer}. |
|
')</td></tr>'); |
} |
} |
$request->print('</table>'); |
$request->print('</table>'); |
} else { |
} else { |
$request->print('<p>Part '.$part. |
$request->print('<p>Part '.$part. |
' is not analyzabale at this time</p>'); |
' is not analyzable at this time</p>'); |
} |
} |
} |
} |
|
if (scalar(keys(%allparts)) == 0 ) { |
|
$request->print('<p>Found no analyzable parts in this problem, |
|
currently only Numerical, Formula and String response |
|
styles are supported.</p>'); |
|
} |
&Apache::lonhtmlcommon::Close_PrgWin($request,\%prog_state); |
&Apache::lonhtmlcommon::Close_PrgWin($request,\%prog_state); |
&analyze_footer($request); |
&analyze_footer($request); |
&Apache::lonhomework::showhash(%overall); |
&Apache::lonhomework::showhash(%overall); |
Line 453 sub editxmlmode {
|
Line 524 sub editxmlmode {
|
&renderpage($request,$file); |
&renderpage($request,$file); |
} else { |
} else { |
my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem); |
my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem); |
my $xml_help = '<table><tr><td>'. |
my $xml_help = Apache::loncommon::helpLatexCheatsheet("Problem_Editor_XML_Index", |
&Apache::loncommon::help_open_topic("Problem_Editor_XML_Index",'Problem Editing Help') |
"Problem Editing Help"); |
.'</td><td>'. |
|
&Apache::loncommon::help_open_topic("Greek_Symbols",'Greek Symbols', |
|
undef,undef,600) |
|
.'</td><td>'. |
|
&Apache::loncommon::help_open_topic("Other_Symbols",'Other Symbols', |
|
undef,undef,600) |
|
.'</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; } |
Line 547 sub get_template_list {
|
Line 611 sub get_template_list {
|
} |
} |
if (@allnames && !$result) { |
if (@allnames && !$result) { |
$result="<option>Select a $extension template</option>\n<option>". |
$result="<option>Select a $extension template</option>\n<option>". |
join('</option><option>',sort(@allnames)).'</option>'; |
join('</option><option>',sort(@allnames)).'</option>'; |
} |
} |
return $result; |
return $result; |
} |
} |
Line 557 sub newproblem {
|
Line 621 sub newproblem {
|
my $extension=$request->uri; |
my $extension=$request->uri; |
$extension=~s:^.*\.([\w]+)$:$1:; |
$extension=~s:^.*\.([\w]+)$:$1:; |
&Apache::lonxml::debug("Looking for :$extension:"); |
&Apache::lonxml::debug("Looking for :$extension:"); |
|
my $templatelist=&get_template_list('',$extension); |
if ($ENV{'form.template'} && |
if ($ENV{'form.template'} && |
$ENV{'form.template'} ne "Select a $extension type") { |
$ENV{'form.template'} ne "Select a $extension template") { |
use File::Copy; |
use File::Copy; |
my $file = &get_template_list($ENV{'form.template'},$extension); |
my $file = &get_template_list($ENV{'form.template'},$extension); |
my $dest = &Apache::lonnet::filelocation("",$request->uri); |
my $dest = &Apache::lonnet::filelocation("",$request->uri); |
copy($file,$dest); |
copy($file,$dest); |
&renderpage($request,$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. |
# I don't like hard-coded filenames but for now, this will work. |
use File::Copy; |
use File::Copy; |
my $templatefilename = |
my $templatefilename = |
$request->dir_config('lonIncludes').'/templates/blank.problem'; |
$request->dir_config('lonIncludes').'/templates/blank.problem'; |
&Apache::lonxml::debug("$templatefilename"); |
&Apache::lonxml::debug("$templatefilename"); |
my $dest = &Apache::lonnet::filelocation("",$request->uri); |
my $dest = &Apache::lonnet::filelocation("",$request->uri); |
copy($templatefilename,$dest); |
copy($templatefilename,$dest); |
&renderpage($request,$dest); |
&renderpage($request,$dest); |
} else { |
} else { |
my $templatelist=&get_template_list('',$extension); |
|
my $url=$request->uri; |
my $url=$request->uri; |
my $dest = &Apache::lonnet::filelocation("",$request->uri); |
my $dest = &Apache::lonnet::filelocation("",$request->uri); |
|
my $errormsg; |
|
if ($ENV{'form.newfile'}) { |
|
$errormsg='<p><font color="red">You did not select a template.</font></p>'."\n"; |
|
} |
my $instructions; |
my $instructions; |
if ($templatelist) { $instructions=", select a template from the pull-down menu below.<br />Then";} |
if ($templatelist) { $instructions=", select a template from the pull-down menu below.<br />Then";} |
$request->print(<<ENDNEWPROBLEM); |
$request->print(<<ENDNEWPROBLEM); |
<body bgcolor="#FFFFFF"> |
<body bgcolor="#FFFFFF"> |
<h1>Creating a new $extension resource</h1> |
<h1>Creating a new $extension resource</h1> |
|
$errormsg |
The requested file <tt>$url</tt> currently does not exist. |
The requested file <tt>$url</tt> currently does not exist. |
<p> |
<p> |
To create a new $extension$instructions click on the "Create $extension" button. |
<b>To create a new $extension$instructions click on the "Create $extension" button.</b> |
</p> |
</p> |
<p><form action="$url" method="POST"> |
<p><form action="$url" method="POST"> |
ENDNEWPROBLEM |
ENDNEWPROBLEM |
Line 649 sub handler {
|
Line 718 sub handler {
|
&Apache::lonxml::debug('symb is '.$symb); |
&Apache::lonxml::debug('symb is '.$symb); |
if ($ENV{'request.state'} eq "construct" || $symb eq '') { |
if ($ENV{'request.state'} eq "construct" || $symb eq '') { |
if ($ENV{'form.resetdata'} eq 'Reset Submissions' || |
if ($ENV{'form.resetdata'} eq 'Reset Submissions' || |
$ENV{'form.resetdata'} eq 'New Problem Variation' ) { |
$ENV{'form.resetdata'} eq 'New Problem Variation' || |
|
$ENV{'form.newrandomization'} eq 'New Randomization') { |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
&Apache::lonnet::tmpreset($symb,'',$domain,$name); |
&Apache::lonnet::tmpreset($symb,'',$domain,$name); |
|
&Apache::lonxml::debug("Attempt reset"); |
} |
} |
} |
} |
if ($ENV{'request.state'} eq "construct") { |
if ($ENV{'request.state'} eq "construct") { |
if ( -e $file ) { |
if ( -e $file ) { |
|
&Apache::loncommon::get_unprocessed_cgi |
|
($ENV{'QUERY_STRING'},['problemmode']); |
if (!(defined $ENV{'form.problemmode'})) { |
if (!(defined $ENV{'form.problemmode'})) { |
#first visit to problem in construction space |
#first visit to problem in construction space |
#&view_or_edit_menu($request); |
#&view_or_edit_menu($request); |
Line 663 sub handler {
|
Line 736 sub handler {
|
&renderpage($request,$file); |
&renderpage($request,$file); |
} elsif ($ENV{'form.problemmode'} eq 'EditXML') { |
} elsif ($ENV{'form.problemmode'} eq 'EditXML') { |
&editxmlmode($request,$file); |
&editxmlmode($request,$file); |
} elsif ($ENV{'form.problemmode'} eq 'Answer Distribution') { |
} elsif ($ENV{'form.problemmode'} eq 'Calculate answers') { |
&analyze($request,$file); |
&analyze($request,$file); |
} else { |
} else { |
&renderpage($request,$file); |
&renderpage($request,$file); |