--- loncom/homework/lonhomework.pm 2001/05/13 20:01:34 1.43 +++ loncom/homework/lonhomework.pm 2001/08/06 18:24:37 1.51 @@ -1,7 +1,17 @@ -# The LON-CAPA Homework handler -# Guy Albertelli +# The LON-CAPA homework handler +# +# Handles homework. +# +# YEAR=2000 +# 7/25,8/2,8/7,8/8,8/11,9/14,9/19,10/2,10/5,10/11,11/7,11/21 Guy Albertelli # 11/30 Gerd Kortemeyer +# 12/4,12/8,12/12,12/15,12/19,12/21 Guy Albertelli +# YEAR=2001 +# 1/6,1/8,1/9,1/10,1/11,1/12,1/15,1/25,2/7,2/13,2/19,4/16,4/26 Guy Albertelli +# 5/4,5/13,5/21 Guy Albertelli # 6/1 Gerd Kortemeyer +# 6/5,6/12,6/26,7/2,7/18 Guy Albertelli +# 8/6 Scott Harrison package Apache::lonhomework; use strict; @@ -14,264 +24,325 @@ use Apache::response; use Apache::hint; use Apache::outputtags; use Apache::Constants qw(:common); +#use Time::HiRes qw( gettimeofday tv_interval ); - +# ======================================================================= BEGIN sub BEGIN { &Apache::lonxml::register_insert(); } +# =============================================== Get target (returns an array) sub get_target { - if ( $ENV{'request.state'} eq "published") { - if ( defined $ENV{'form.submitted'}) { - return ('grade', 'web'); - } else { - return ('web'); - } - } 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") { if ( defined $ENV{'form.submitted'}) { - return ('grade', 'web'); + return ('grade','web'); } else { - return ('web'); + 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.preview'}) { + if ( defined $ENV{'form.submitted'}) { + return ('grade','web'); + } else { + return ('web'); + } } else { - return ('edit'); + if ( $ENV{'form.problemmode'} eq 'View' ) { + if ( defined $ENV{'form.submitted'}) { + return ('grade','web'); + } else { + return ('web'); + } + } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) { + if ( $ENV{'form.submitted'} eq 'edit' ) { + return ('modified','edit'); + } else { + return ('edit'); + } + } else { + return ('web'); + } } - } else { - return ('web'); - } } - } - return (); + return (); } +# ===================================== Set up variables (return scalar string) sub setup_vars { - my ($target) = @_; - return ';' + my ($target) = @_; + return ';' # return ';$external::target='.$target.';'; } +# ================================================================= Send header sub send_header { - my ($request)= @_; - $request->print(&Apache::lontexconvert::header()); + my ($request) = @_; + $request->print(&Apache::lontexconvert::header()); # $request->print('
'); } +# ================================================================= Create menu sub createmenu { - my ($which,$request)=@_; - if ($which eq 'grade') { - $request->print(''); - } + my ($which,$request) = @_; + if ($which eq 'grade') { + $request->print(''); + } } +# ================================================================= Send footer sub send_footer { - my ($request)= @_; + my ($request) = @_; # $request->print('
'); - $request->print(&Apache::lontexconvert::footer()); + $request->print(&Apache::lontexconvert::footer()); } -$Apache::lonxml::browse=''; +$Apache::lonxml::browse = ''; + +# =============================================== Check date (returns an array) sub check_date { - 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; + &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; + } + if (!$passed) { $type = $temp; last; } } - 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'; } - } - &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("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'; } + } + &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); } +# ================================================================== Shows hash 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) = @_; + my $resultkey; + foreach $resultkey (sort keys %hash) { + &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}"); + } + &Apache::lonxml::debug("\n
restored values^
\n"); + return ''; } +# =========================================================== Setup permissions 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'}); + $Apache::lonhomework::viewgrades = &Apache::lonnet::allowed('vgr', + $ENV{'request.course.id'}); + return ''; } +# ================================================================ Setup header sub setupheader { - my $request=$_[0]; - if ($ENV{'browser.mathml'}) { - $request->content_type('text/xml'); - } else { - $request->content_type('text/html'); - } - $request->send_http_header; - return OK if $request->header_only; - return '' -} - -sub renderpage { - my ($request,$file) = @_; - - my (@targets) = &get_target(); - foreach my $target (@targets) { - my $problem=&Apache::lonnet::getfile($file); - if ($problem == -1) { - &Apache::lonxml::error(" Unable to find $file"); - $problem=''; - } - - my %mystyle; - my $result = ''; - &Apache::inputtags::initialize_inputtags; - %Apache::lonhomework::results=(); - %Apache::lonhomework::history=&Apache::lonnet::restore(); - #ignore error conditions - my ($temp)=keys %Apache::lonhomework::history ; - if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); } - if ($target eq 'web') { - if (&Apache::lonnet::symbread() eq '') { - if ($ENV{'request.state'} eq "construct") { - $request->print("In construction space, submissions ignored
"); + my $request = $_[0]; + if ($ENV{'browser.mathml'}) { + $request->content_type('text/xml'); + } else { + $request->content_type('text/html'); + } + $request->send_http_header; + return OK if $request->header_only; + return ''; +} + +# ========================================================= Handle save or undo +sub handle_save_or_undo { + my ($request,$problem,$result) = @_; + my $fileout = &Apache::lonnet::filelocation("",$request->uri); + my $filesave = $fileout.".bak"; + if ($ENV{'form.Undo'} eq 'undo') { + if (copy($filesave,$fileout)) { + $request->print("Undid changes, Copied $filesave to $fileout". + "
"); } else { - $request->print("Browsing or ambiguous reference, submissions ignored
"); + $request->print("Unable to ". + "undo, unable to copy $filesave to $fileout
"); } - } - 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=''; - } - $result = &Apache::lonxml::xmlparse($target, $problem, - $default.&setup_vars($target),%mystyle); - - #$request->print("Result follows:"); - if ($target eq 'modified') { - my $fileout = &Apache::lonnet::filelocation("",$request->uri); - my $filesave=$fileout.".bak"; - - my $fs=Apache::File->new(">$filesave"); - print $fs $problem; - $request->print("Making Backup to $filesave
"); - - my $fh=Apache::File->new(">$fileout"); - print $fh $result; - $request->print("Saving Modifications to $fileout
"); } else { - $request->print($result); + 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"); + } + 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"); + } } - #$request->print(":Result ends"); - if ($target eq 'grade') { &showhash(%Apache::lonhomework::results); } +} - #store new values - my ($temp) = keys %Apache::lonhomework::results; - if ( $temp ne '' ) { - &Apache::lonxml::debug("Store return message:". - &Apache::lonnet::cstore(\%Apache::lonhomework::results)); +# ================================================================= Render page +sub renderpage { + 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 %mystyle; + my $result = ''; + &Apache::inputtags::initialize_inputtags; + &Apache::edit::initialize_edit; + %Apache::lonhomework::results=(); + %Apache::lonhomework::history=&Apache::lonnet::restore(); + #ignore error conditions + my ($temp)=keys %Apache::lonhomework::history ; + if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); } + if ($target eq 'web') { + if (&Apache::lonnet::symbread() eq '') { + if ($ENV{'request.state'} eq "construct") { + $request->print("In construction space, submissions ". + "ignored
"); + } else { + $request->print("Browsing or ". + "ambiguous reference, submissions ". + "ignored
"); + } + } + #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=''; + } + $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"); + if ($target eq 'grade') { &showhash(%Apache::lonhomework::results); } + + #store new values + my ($temp) = keys %Apache::lonhomework::results; + if ( $temp ne '' ) { + &Apache::lonxml::debug("Store return message:". + &Apache::lonnet::cstore(\%Apache::lonhomework::results)); + } + #my $td=&tv_interval($t0); } - } } +# =========================================================== Get template list # with no arg it returns a HTML "; + my ($namewanted,$extension) = @_; + my $result; + &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 { + $result.=""; + } } - } - return $result; + return $result; } +# ================================================================= New problem sub newproblem { - my ($request) = @_; - - if ($ENV{'form.template'}) { - use File::Copy; - my $file = &get_template_list($ENV{'form.template'}); - my $dest = &Apache::lonnet::filelocation("",$request->uri); - copy($file,$dest); - &renderpage($request,$file); - } else { - my $templatelist=&get_template_list(); - my $url=$request->uri; - $request->print(<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 $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 problem
+The request file $url doesn\'t exist. You can create a new $extension
-
+
@@ -284,9 +355,9 @@ ENDNEWPROBLEM } sub view_or_edit_menu { - my ($request) = @_; - my $url=$request->uri; - $request->print(<uri; + $request->print(< Would you like to or @@ -296,54 +367,61 @@ Would you like to uri; + $ENV{'request.uri'} = $request->uri; #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:"); - - 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; + $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.":"); + + 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 ( -e $file ) { - if (!(defined $ENV{'form.problemmode'})) { - #first visit to problem in construction space - &view_or_edit_menu($request); - #&renderpage($request,$file); - } else { - &renderpage($request,$file); + if ($ENV{'request.state'} eq "construct") { + if ( -e $file ) { + if (!(defined $ENV{'form.problemmode'})) { + #first visit to problem in construction space + &view_or_edit_menu($request); + #&renderpage($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 + &renderpage($request,$file); } - } else { - # just render the page normally outside of construction space - &renderpage($request,$file); - } - - &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; } 1; + __END__