--- loncom/homework/lonhomework.pm 2000/08/11 14:57:32 1.8 +++ loncom/homework/lonhomework.pm 2000/12/12 22:35:52 1.20 @@ -1,5 +1,6 @@ # The LON-CAPA Homework handler # Guy Albertelli +# 11/30 Gerd Kortemeyer package Apache::lonhomework; use strict; @@ -8,62 +9,153 @@ use Apache::lonxml; use Apache::lonnet; use Apache::inputtags; use Apache::structuretags; +use Apache::response; -sub handler { - my $request=shift; - - my $target=&get_target(); - $request->content_type('text/html'); - $request->send_http_header; - &Apache::lonhomework::send_header($request); - my $file = "/home/httpd/html".$request->uri; - my %mystyle; - my $result = ''; - &Apache::inputtags::initialize_inputtags; - $result = Apache::lonxml::xmlparse($target, &getfile($file), - &getfile('/home/httpd/html/res/103/albertel/default_homework').&setup_vars($target),%mystyle); - #$request->print("Result follows:"); - $request->print($result); - #$request->print(":Result ends"); - &Apache::lonhomework::send_footer($request); -} sub get_target { - return "web"; + if ( $ENV{'request.state'} eq "published") { + if ( defined $ENV{'form.submit'}) { + return ('grade', 'web'); + } else { + return ('web'); + } + } elsif ($ENV{'request.state'} eq "construct") { + if ( defined $ENV{'form.preview'}) { + if ( defined $ENV{'form.submit'}) { + return ('grade', 'web'); + } else { + return ('web'); + } + } else { + return ('edit'); + } + } + return (); } sub setup_vars { my ($target) = @_; - return ';$external::target='.$target.';'; + return ';' +# return ';$external::target='.$target.';'; } sub send_header { my ($request)= @_; - $request->print(''); - $request->print('
'); + $request->print(&Apache::lontexconvert::header()); + $ENV{'request.uri'}=$request->uri; +# $request->print(''); } sub send_footer { my ($request)= @_; - $request->print('
'); - $request->print(''); +# $request->print(''); + $request->print(&Apache::lontexconvert::footer()); } -sub getfile { - my ($filename) = @_; - my $a=""; - if (! -e $filename ) { - &Apache::lonnet::subscribe($filename); - &Apache::lonnet::repcopy($filename); +sub check_date { + my ($type,$id) = @_; + my $date =''; + my $passed = ''; + &Apache::lonxml::debug("checking :$type: for part :$id:"); + if ($type eq 'OPEN_DATE') { + $date = &Apache::lonnet::EXT("resource.$id.opendate"); + } elsif ($type eq 'DUE_DATE') { + $date = &Apache::lonnet::EXT("resource.$id.duedate"); + } elsif ($type eq 'START_DATE') { + $date = &Apache::lonnet::EXT("resource.$id.duedate"); + } else { + &Apache::lonxml::error("Unknown date request $type"); + $date = ''; + } + &Apache::lonxml::debug("found :$date:"); + if ($date eq '') { + $date = "an unknown date"; $passed = 0; + } else { + if (time < $date) { $passed = 0; } else { $passed = 1; } + $date = localtime $date; } - { - my $fh=Apache::File->new($filename); + &Apache::lonxml::debug("sending back :$date:$passed:"); + return ($date,$passed); +} + +sub handler { + my $request=$_[0]; - while (<$fh>) { - $a .=$_; + if ( $ENV{'user.name'} eq 'albertel' ) { $Apache::lonxml::debug=1; } + + my (@targets) = &get_target(); + + 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; + + &Apache::lonhomework::send_header($request); + + #check if allowed to see + + foreach my $target (@targets) { + my $file=&Apache::lonnet::filelocation("",$request->uri); + 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' && &Apache::lonnet::symbread() eq '') { + $request->print("Vieiwing this problem as not a student, submissions will be ignored."); + } + if ($target eq 'grade') { + my $resultkey; + foreach $resultkey (sort keys %Apache::lonhomework::history) { + &Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::history{$resultkey}"); + } + &Apache::lonxml::debug("\n
restored values^
\n"); + } + 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=''; + } + if ( $target eq 'grade') { + $Apache::lonxml::textredirection = 0; + } else { + $Apache::lonxml::textredirection = 1; + } + $result = &Apache::lonxml::xmlparse($target, $problem, + $default.&setup_vars($target),%mystyle); + + #$request->print("Result follows:"); + $request->print($result); + #$request->print(":Result ends"); + if ($target eq 'grade') { + my $resultkey; + foreach $resultkey (sort keys %Apache::lonhomework::results) { + &Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::results{$resultkey}"); + } + &Apache::lonxml::debug("\n
storing values^
\n"); + } + + my ($temp) = keys %Apache::lonhomework::results; + if ( $temp ne '' ) { + &Apache::lonxml::debug("Store return message:".&Apache::lonnet::cstore(%Apache::lonhomework::results)); } } - return $a + &Apache::lonhomework::send_footer($request); + + return 'OK'; + } 1;