--- loncom/homework/lonhomework.pm 2002/09/23 17:29:37 1.89
+++ loncom/homework/lonhomework.pm 2002/09/24 12:39:42 1.90
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.89 2002/09/23 17:29:37 albertel Exp $
+# $Id: lonhomework.pm,v 1.90 2002/09/24 12:39:42 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -59,10 +59,14 @@ BEGIN {
sub get_target {
if ( $ENV{'request.state'} eq "published") {
- if ( defined($ENV{'form.grade_target'})
+ 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 == 'F' )) {
return ($ENV{'form.grade_target'});
}
+
if ( defined($ENV{'form.submitted'})) {
return ('grade', 'web');
} else {
@@ -121,7 +125,7 @@ sub createmenu {
my ($which,$request)=@_;
if ($which eq 'grade') {
$request->print('');
}
@@ -200,7 +204,7 @@ sub check_access {
&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");
+ &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';
}
@@ -389,9 +393,9 @@ sub renderpage {
if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); }
if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%ENV,'^form');}
- my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm');
+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");
+ &Apache::lonxml::error("Unable to find default_homework.lcpm");
$default='';
}
&Apache::lonxml::debug("Should be parsing now");
@@ -425,7 +429,8 @@ sub get_template_list {
my $result;
my @allnames;
&Apache::lonxml::debug("Looking for :$extension:");
- foreach my $file () {
+ foreach my $file ()
+ {
my $name=&Apache::lonnet::metadata($file,'title');
if ($namewanted && ($name eq $namewanted)) {
$result=$file;
@@ -500,7 +505,7 @@ sub handler {
#my $t0 = [&gettimeofday()];
my $request=$_[0];
- if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;}
+# if ( $ENV{'user.name'} eq 'physnet' ) {$Apache::lonxml::debug=1;}
if (&setupheader($request)) { return OK; }
$ENV{'request.uri'}=$request->uri;