--- loncom/homework/lonhomework.pm 2000/11/30 16:20:49 1.17
+++ loncom/homework/lonhomework.pm 2001/01/06 16:35:36 1.27
@@ -1,6 +1,7 @@
# The LON-CAPA Homework handler
# Guy Albertelli
# 11/30 Gerd Kortemeyer
+# 6/1 Gerd Kortemeyer
package Apache::lonhomework;
use strict;
@@ -10,44 +11,28 @@ use Apache::lonnet;
use Apache::inputtags;
use Apache::structuretags;
use Apache::response;
-
-
-sub subhandler {
- my ($target,$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=(); }
-
- 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='';
- }
-
- return Apache::lonxml::xmlparse($target, $problem,
- $default.&setup_vars($target),%mystyle);
-}
+use Apache::hint;
+use Apache::Constants qw(:common);
sub get_target {
if ( $ENV{'request.state'} eq "published") {
- return 'web';
+ if ( defined $ENV{'form.submit'}) {
+ return ('grade', 'web');
+ } else {
+ return ('web');
+ }
} elsif ($ENV{'request.state'} eq "construct") {
if ( defined $ENV{'form.preview'}) {
- return 'web';
+ if ( defined $ENV{'form.submit'}) {
+ return ('grade', 'web');
+ } else {
+ return ('web');
+ }
} else {
- return 'edit';
+ return ('edit');
}
}
+ return ();
}
sub setup_vars {
@@ -69,62 +54,139 @@ sub send_footer {
$request->print(&Apache::lontexconvert::footer());
}
-sub getfilenothere {
- my ($filename) = @_;
- my $a="";
- if (! -e $filename ) {
- &Apache::lonnet::subscribe($filename);
- &Apache::lonnet::repcopy($filename);
- }
- {
- my $fh=Apache::File->new($filename);
-
- while (<$fh>) {
- $a .=$_;
+#@Apache::lonhomework::date_status=();
+#@Apache::lonhomework::date_msg=();
+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;
+ } else {
+ if (time < $date) { $passed = 0; } else { $passed = 1; }
+ $date = localtime $date;
}
+ if (!$passed) { $type=$temp; last; }
}
- return $a
+ &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 as $lastdate, and answers will be available at $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 ($ENV{'request.state'} eq "construct") {
+ &Apache::lonxml::debug("in construction ignoring dates");
+ $status='CAN_ANSWER';
+ $datemsg='is in under construction';
+ }
+ return ($status,$datemsg);
}
sub handler {
- my $request=shift;
+ my $request=$_[0];
+
+ if ( $ENV{'user.name'} eq 'albertel' ) { $Apache::lonxml::debug=1; }
+
+ my (@targets) = &get_target();
- $Apache::lonxml::debug=1;
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 OK if $request->header_only;
+
&Apache::lonhomework::send_header($request);
- 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 $result=&subhandler(&get_target(),$problem);
-
- #$request->print("Result follows:");
- $request->print($result);
- #$request->print(":Result ends");
+
+ #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);
- my $temp;
- my $resultkey;
- foreach $resultkey (sort keys %Apache::lonhomework::results) {
- &Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::results{$resultkey}");
+ #$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));
+ }
}
- &Apache::lonxml::debug("\n
storing values^\n");
-
&Apache::lonhomework::send_footer($request);
- ($temp) = keys %Apache::lonhomework::results;
- if ( $temp ne '' ) {
- &Apache::lonxml::debug("Store return message:".&Apache::lonnet::cstore(%Apache::lonhomework::results));
- }
- return 'OK';
+
+ return OK;
}