version 1.81, 2002/06/26 17:20:38
|
version 1.138.2.1, 2003/10/15 22:18:26
|
Line 28
|
Line 28
|
# Guy Albertelli |
# Guy Albertelli |
# 11/30 Gerd Kortemeyer |
# 11/30 Gerd Kortemeyer |
# 6/1,8/17,8/18 Gerd Kortemeyer |
# 6/1,8/17,8/18 Gerd Kortemeyer |
|
# 7/18 Jeremy Bowers |
|
|
package Apache::lonhomework; |
package Apache::lonhomework; |
use strict; |
use strict; |
Line 41 use Apache::randomlabel();
|
Line 42 use Apache::randomlabel();
|
use Apache::response(); |
use Apache::response(); |
use Apache::hint(); |
use Apache::hint(); |
use Apache::outputtags(); |
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::Constants qw(:common); |
use Apache::Constants qw(:common); |
use HTML::Entities(); |
use HTML::Entities(); |
|
use Apache::loncommon(); |
#use Time::HiRes qw( gettimeofday tv_interval ); |
#use Time::HiRes qw( gettimeofday tv_interval ); |
|
|
BEGIN { |
BEGIN { |
Line 50 BEGIN {
|
Line 61 BEGIN {
|
} |
} |
|
|
sub get_target { |
sub get_target { |
if ( $ENV{'request.state'} eq "published") { |
if (($ENV{'request.state'} eq "published") || |
if ( defined($ENV{'form.grade_target'}) |
($ENV{'request.state'} eq "uploaded")) { |
&& ($Apache::lonhomework::viewgrades == 'F' )) { |
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'}); |
return ($ENV{'form.grade_target'}); |
} |
} |
if ( defined($ENV{'form.submitted'})) { |
|
|
if ( defined($ENV{'form.submitted'}) && |
|
( !defined($ENV{'form.resetdata'})) && |
|
( !defined($ENV{'form.newrandomization'}))) { |
return ('grade', 'web'); |
return ('grade', 'web'); |
} else { |
} else { |
return ('web'); |
return ('web'); |
Line 71 sub get_target {
|
Line 89 sub get_target {
|
return ('web'); |
return ('web'); |
} |
} |
} else { |
} else { |
if ( $ENV{'form.problemmode'} eq 'View' ) { |
if ( $ENV{'form.problemmode'} eq '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 126 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 |
|
# in lonnavmaps::resource::getDateStatus. |
sub check_access { |
sub check_access { |
my ($id) = @_; |
my ($id) = @_; |
my $date =''; |
my $date =''; |
my $status = ''; |
my $status; |
my $datemsg = ''; |
my $datemsg = ''; |
my $lastdate = ''; |
my $lastdate = ''; |
my $temp; |
my $temp; |
my $type; |
my $type; |
my $passed; |
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); |
|
} |
|
|
&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"); |
|
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:"); |
&Apache::lonxml::debug("found :$date: for :$temp:"); |
if ($date eq '') { |
if ($date eq '') { |
$date = "an unknown date"; $passed = 0; |
$date = "an unknown date"; $passed = 0; |
Line 166 sub check_access {
|
Line 264 sub check_access {
|
$datemsg = "was due on $lastdate, and answers will be available on $date"; |
$datemsg = "was due on $lastdate, and answers will be available on $date"; |
} |
} |
if ($status eq 'CAN_ANSWER') { |
if ($status eq 'CAN_ANSWER') { |
#check #tries |
#check #tries, and if correct. |
my $tries = $Apache::lonhomework::history{"resource.$id.tries"}; |
my $tries = $Apache::lonhomework::history{"resource.$id.tries"}; |
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 (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') && |
#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 186 sub check_access {
|
Line 292 sub check_access {
|
$status='CAN_ANSWER'; |
$status='CAN_ANSWER'; |
$datemsg='is closed but you are allowed to view it'; |
$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); |
return ($status,$datemsg); |
} |
} |
|
|
sub showhash { |
sub showhash { |
my (%hash) = @_; |
my (%hash) = @_; |
&showhashsubset(\%hash,''); |
&showhashsubset(\%hash,'.'); |
return ''; |
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 { |
sub showhashsubset { |
my ($hash,$keyre) = @_; |
my ($hash,$keyre) = @_; |
my $resultkey; |
my $resultkey; |
Line 207 sub showhashsubset {
|
Line 326 sub showhashsubset {
|
if ($resultkey =~ /$keyre/) { |
if ($resultkey =~ /$keyre/) { |
if (ref($$hash{$resultkey})) { |
if (ref($$hash{$resultkey})) { |
if ($$hash{$resultkey} =~ /ARRAY/ ) { |
if ($$hash{$resultkey} =~ /ARRAY/ ) { |
my $string="$resultkey ---- ("; |
&Apache::lonxml::debug("$resultkey ---- ". |
foreach my $elm (@{ $$hash{$resultkey} }) { |
&showarray($$hash{$resultkey})); |
$string.="$elm,"; |
} elsif ($$hash{$resultkey} =~ /HASH/ ) { |
} |
&Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); |
chop($string); |
&showhashsubset($$hash{$resultkey},'.'); |
&Apache::lonxml::debug("$string)"); |
|
} else { |
} else { |
&Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); |
&Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); |
} |
} |
} else { |
} else { |
&Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); |
&Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); |
Line 227 sub showhashsubset {
|
Line 345 sub showhashsubset {
|
|
|
sub setuppermissions { |
sub setuppermissions { |
$Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'}); |
$Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'}); |
$Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}); |
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 '' |
return '' |
} |
} |
|
|
sub setupheader { |
sub setupheader { |
my $request=$_[0]; |
my $request=$_[0]; |
if ($ENV{'browser.mathml'}) { |
if ($ENV{'browser.mathml'}) { |
$request->content_type('text/xml'); |
$request->content_type('text/xml'); |
} else { |
} else { |
$request->content_type('text/html'); |
$request->content_type('text/html'); |
} |
} |
if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) { |
$request->content_encoding('UTF-8'); |
&Apache::loncommon::no_cache($request); |
if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) { |
} |
&Apache::loncommon::no_cache($request); |
$request->send_http_header; |
} |
return OK if $request->header_only; |
$request->send_http_header; |
return '' |
return OK if $request->header_only; |
|
return '' |
} |
} |
|
|
sub handle_save_or_undo { |
sub handle_save_or_undo { |
Line 285 sub handle_save_or_undo {
|
Line 411 sub handle_save_or_undo {
|
return $error; |
return $error; |
} |
} |
|
|
|
sub analyze_header { |
|
my ($request) = @_; |
|
my $result.='<html> |
|
<head><title>Analyzing a problem</title></head> |
|
<body bgcolor="#FFFFFF"> |
|
<form name="lonhomework" method="POST" action="'. |
|
$ENV{'request.uri'}.'"> |
|
<input type="submit" name="problemmode" value="EditXML" /> |
|
<input type="submit" name="problemmode" value="Edit" /> |
|
<hr /> |
|
<input type="submit" name="submit" value="View" /> |
|
<hr /> |
|
List of possible answers: |
|
</form>'; |
|
$request->print($result); |
|
$request->rflush(); |
|
} |
|
|
|
sub analyze_footer { |
|
my ($request) = @_; |
|
my $result='</body></html>'; |
|
$request->print($result); |
|
$request->rflush(); |
|
} |
|
|
sub analyze { |
sub analyze { |
my ($request,$file) = @_; |
my ($request,$file) = @_; |
&Apache::lonxml::debug("Analyze"); |
&Apache::lonxml::debug("Analyze"); |
my $result=&Apache::lonnet::ssi($request->uri,('grade_target' => 'analyze')); |
my $result; |
&Apache::lonxml::debug(":$result:"); |
my %overall; |
(my $garbage,$result)=split(/_HASH_REF__/,$result,2); |
my %allparts; |
&showhash(&Apache::lonnet::str2hash($result)); |
my $rndseed=$ENV{'form.rndseed'}; |
return $result; |
&analyze_header($request); |
|
my %prog_state= |
|
&Apache::lonhtmlcommon::Create_PrgWin($request,'Analyze Progress', |
|
'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'); |
|
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'} }]); |
|
} |
|
} |
|
} |
|
&Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state, |
|
'Analyzing Results'); |
|
foreach my $part (sort(keys(%allparts))) { |
|
if (defined(@{ $overall{$part.'.answer'} })) { |
|
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'} })) { |
|
$frequency{join("\0",@{ $answer })}++; |
|
} |
|
$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>'); |
|
} else { |
|
$request->print('<p>Part '.$part. |
|
' 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); |
|
&analyze_footer($request); |
|
&Apache::lonhomework::showhash(%overall); |
|
return $result; |
} |
} |
|
|
sub editxmlmode { |
sub editxmlmode { |
my ($request,$file) = @_; |
my ($request,$file) = @_; |
my $result; |
my $result; |
my $problem=&Apache::lonnet::getfile($file); |
my $problem=&Apache::lonnet::getfile($file); |
if ($problem == -1) { |
if ($problem eq -1) { |
&Apache::lonxml::error("<b> Unable to find <i>$file</i></b>"); |
&Apache::lonxml::error("<b> Unable to find <i>$file</i></b>"); |
$problem=''; |
$problem=''; |
} |
} |
Line 315 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 = Apache::loncommon::helpLatexCheatsheet("Problem_Editor_XML_Index", |
|
"Problem Editing Help"); |
if ($cols > 80) { $cols = 80; } |
if ($cols > 80) { $cols = 80; } |
|
if ($cols < 70) { $cols = 70; } |
|
if ($rows < 20) { $rows = 20; } |
$result.='<html><body bgcolor="#FFFFFF"> |
$result.='<html><body bgcolor="#FFFFFF"> |
<form name="lonhomework" method="POST" action="'. |
<form name="lonhomework" method="POST" action="'. |
$ENV{'request.uri'}.'"> |
$ENV{'request.uri'}.'"> |
Line 327 sub editxmlmode {
|
Line 540 sub editxmlmode {
|
<input type="submit" name="submit" value="Submit Changes and View" /> |
<input type="submit" name="submit" value="Submit Changes and View" /> |
<input type="submit" name="Undo" value="undo" /> |
<input type="submit" name="Undo" value="undo" /> |
<hr /> |
<hr /> |
|
' . $xml_help . ' |
<textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'. |
<textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'. |
&HTML::Entities::encode($problem).'</textarea> |
&HTML::Entities::encode($problem).'</textarea> |
</form></body></html>'; |
</form></body></html>'; |
Line 343 sub renderpage {
|
Line 557 sub renderpage {
|
foreach my $target (@targets) { |
foreach my $target (@targets) { |
#my $t0 = [&gettimeofday()]; |
#my $t0 = [&gettimeofday()]; |
my $problem=&Apache::lonnet::getfile($file); |
my $problem=&Apache::lonnet::getfile($file); |
if ($problem == -1) { |
if ($problem eq -1) { |
&Apache::lonxml::error("<b> Unable to find <i>$file</i></b>"); |
&Apache::lonxml::error("<b> Unable to find <i>$file</i></b>"); |
$problem=''; |
$problem=''; |
} |
} |
|
|
my %mystyle; |
my %mystyle; |
my $result = ''; |
my $result = ''; |
&Apache::inputtags::initialize_inputtags; |
if ($target eq 'analyze') { %Apache::lonhomework::analyze=(); } |
&Apache::edit::initialize_edit; |
if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); } |
if ($target eq 'analyze') { %Apache::lonhomework::anaylze=(); } |
if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%ENV,'^form');} |
if ($target eq 'web') { |
|
my ($symb)=&Apache::lonxml::whichuser(); |
|
if ($symb eq '') { |
|
if ($ENV{'request.state'} eq "construct") { |
|
} else { |
|
$request->print("Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored<br />"); |
|
} |
|
} |
|
#if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); } |
|
} |
|
#if ($target eq 'grade') { &showhash(%Apache::lonhomework::history); } |
|
#if ($target eq 'web') { &showhash(%ENV); } |
|
|
|
my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm'); |
|
if ($default == -1) { |
|
&Apache::lonxml::error("<b>Unable to find <i>default_homework.lcpm</i></b>"); |
|
$default=''; |
|
} |
|
&Apache::lonxml::debug("Should be parsing now"); |
&Apache::lonxml::debug("Should be parsing now"); |
$result = &Apache::lonxml::xmlparse($request, $target, $problem, |
$result = &Apache::lonxml::xmlparse($request, $target, $problem, |
$default.&setup_vars($target),%mystyle); |
&setup_vars($target),%mystyle); |
|
undef($Apache::lonhomework::parsing_a_problem); |
#$request->print("Result follows:"); |
#$request->print("Result follows:"); |
if ($target eq 'modified') { |
if ($target eq 'modified') { |
&handle_save_or_undo($request,\$problem,\$result); |
&handle_save_or_undo($request,\$problem,\$result); |
Line 389 sub renderpage {
|
Line 586 sub renderpage {
|
#$result.="<br />Spent $td seconds processing target $target\n</body>"; |
#$result.="<br />Spent $td seconds processing target $target\n</body>"; |
#} |
#} |
$request->print($result); |
$request->print($result); |
|
$request->rflush(); |
} |
} |
#$request->print(":Result ends"); |
#$request->print(":Result ends"); |
#my $td=&tv_interval($t0); |
#my $td=&tv_interval($t0); |
Line 400 sub renderpage {
|
Line 598 sub renderpage {
|
sub get_template_list { |
sub get_template_list { |
my ($namewanted,$extension) = @_; |
my ($namewanted,$extension) = @_; |
my $result; |
my $result; |
|
my @allnames; |
&Apache::lonxml::debug("Looking for :$extension:"); |
&Apache::lonxml::debug("Looking for :$extension:"); |
foreach my $file (</home/httpd/html/res/adm/includes/templates/*.$extension>) { |
foreach my $file (</home/httpd/html/res/adm/includes/templates/*.$extension>) { |
my $name=&Apache::lonnet::metadata($file,'title'); |
my $name=&Apache::lonnet::metadata($file,'title'); |
Line 407 sub get_template_list {
|
Line 606 sub get_template_list {
|
$result=$file; |
$result=$file; |
last; |
last; |
} else { |
} else { |
$result.="<option>$name</option>"; |
if ($name) { push (@allnames, $name); } |
} |
} |
} |
} |
|
if (@allnames && !$result) { |
|
$result="<option>Select a $extension template</option>\n<option>". |
|
join('</option><option>',sort(@allnames)).'</option>'; |
|
} |
return $result; |
return $result; |
} |
} |
|
|
Line 418 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:"); |
if ($ENV{'form.template'}) { |
my $templatelist=&get_template_list('',$extension); |
|
if ($ENV{'form.template'} && |
|
$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); |
if (!defined($templatelist)) { |
my $errormsg; |
# We didn't find a template, so just create a blank problem. |
if ($ENV{'form.newfile'}) { |
$request->print(<<ENDNEWPROBLEM); |
$errormsg='<p><font color="red">You did not select a template.</font></p>'."\n"; |
<body bgcolor="#FFFFFF"> |
} |
The requested file $url doesn\'t exist. You can create a new $extension <br /> |
my $instructions; |
<form action="$url" method="POST"> |
if ($templatelist) { $instructions=", select a template from the pull-down menu below.<br />Then";} |
<input type="submit" name="newfile" value="New $extension"><br /> |
|
</form> |
|
</body> |
|
ENDNEWPROBLEM |
|
return ''; |
|
} |
|
$request->print(<<ENDNEWPROBLEM); |
$request->print(<<ENDNEWPROBLEM); |
<body bgcolor="#FFFFFF"> |
<body bgcolor="#FFFFFF"> |
The requested file $url doesn\'t exist. You can create a new $extension <br /> |
<h1>Creating a new $extension resource</h1> |
<form action="$url" method="POST"> |
$errormsg |
<input type="submit" value="New $extension"><br /> |
The requested file <tt>$url</tt> currently does not exist. |
<select name="template"> |
<p> |
$templatelist |
<b>To create a new $extension$instructions click on the "Create $extension" button.</b> |
</select> |
</p> |
</form> |
<p><form action="$url" method="POST"> |
</body> |
|
ENDNEWPROBLEM |
ENDNEWPROBLEM |
|
if (defined($templatelist)) { |
|
$request->print("<select name=\"template\">$templatelist</select>"); |
|
} |
|
$request->print("<br /><input type=\"submit\" name=\"newfile\" value=\"Create $extension\" />"); |
|
$request->print("</form></p></body>"); |
} |
} |
return ''; |
return ''; |
} |
} |
Line 481 sub handler {
|
Line 683 sub handler {
|
#my $t0 = [&gettimeofday()]; |
#my $t0 = [&gettimeofday()]; |
my $request=$_[0]; |
my $request=$_[0]; |
|
|
if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} |
$Apache::lonxml::debug=$ENV{'user.debug'}; |
|
|
if (&setupheader($request)) { return OK; } |
if (&setupheader($request)) { return OK; } |
$ENV{'request.uri'}=$request->uri; |
$ENV{'request.uri'}=$request->uri; |
Line 512 sub handler {
|
Line 714 sub handler {
|
} |
} |
} |
} |
|
|
|
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' || |
|
$ENV{'form.newrandomization'} eq '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 ($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 ( -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 525 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); |