--- loncom/homework/lonhomework.pm 2001/12/06 16:19:05 1.65
+++ loncom/homework/lonhomework.pm 2002/05/24 18:55:23 1.79
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.65 2001/12/06 16:19:05 matthew Exp $
+# $Id: lonhomework.pm,v 1.79 2002/05/24 18:55:23 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,30 +31,39 @@
package Apache::lonhomework;
use strict;
-use Apache::style;
-use Apache::lonxml;
-use Apache::lonnet;
-use Apache::inputtags;
-use Apache::structuretags;
-use Apache::randomlabel;
-use Apache::response;
-use Apache::hint;
-use Apache::outputtags;
+use Apache::style();
+use Apache::lonxml();
+use Apache::lonnet();
+use Apache::lonplot();
+use Apache::inputtags();
+use Apache::structuretags();
+use Apache::randomlabel();
+use Apache::response();
+use Apache::hint();
+use Apache::outputtags();
use Apache::Constants qw(:common);
+use HTML::Entities();
#use Time::HiRes qw( gettimeofday tv_interval );
-sub BEGIN {
+BEGIN {
&Apache::lonxml::register_insert();
}
sub get_target {
if ( $ENV{'request.state'} eq "published") {
+ if ( defined($ENV{'form.grade_target'})
+ && ($Apache::lonhomework::viewgrades == 'F' )) {
+ return ($ENV{'form.grade_target'});
+ }
if ( defined($ENV{'form.submitted'})) {
return ('grade', 'web');
} else {
return ('web');
}
} elsif ($ENV{'request.state'} eq "construct") {
+ if ( defined($ENV{'form.grade_target'}) ) {
+ return ($ENV{'form.grade_target'});
+ }
if ( defined($ENV{'form.preview'})) {
if ( defined($ENV{'form.submitted'})) {
return ('grade', 'web');
@@ -123,6 +132,7 @@ sub check_access {
my $type;
my $passed;
&Apache::lonxml::debug("checking for part :$id:");
+ &Apache::lonxml::debug("time:".time);
foreach $temp ("opendate","duedate","answerdate") {
$lastdate = $date;
$date = &Apache::lonnet::EXT("resource.$id.$temp");
@@ -182,9 +192,30 @@ sub check_access {
sub showhash {
my (%hash) = @_;
+ &showhashsubset(\%hash,'');
+ return '';
+}
+
+sub showhashsubset {
+ my ($hash,$keyre) = @_;
my $resultkey;
- foreach $resultkey (sort keys %hash) {
- &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}");
+ foreach $resultkey (sort keys %$hash) {
+ if ($resultkey =~ /$keyre/) {
+ if (ref($$hash{$resultkey})) {
+ if ($$hash{$resultkey} =~ /ARRAY/ ) {
+ my $string="$resultkey ---- (";
+ foreach my $elm (@{ $$hash{$resultkey} }) {
+ $string.="$elm,";
+ }
+ chop($string);
+ &Apache::lonxml::debug("$string)");
+ } else {
+ &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");
+ }
+ } else {
+ &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");
+ }
+ }
}
&Apache::lonxml::debug("\n
restored values^\n");
return '';
@@ -203,7 +234,9 @@ sub setupheader {
} else {
$request->content_type('text/html');
}
- if (!$Apache::lonxml::debug) { &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;
return ''
@@ -211,38 +244,53 @@ sub setupheader {
sub handle_save_or_undo {
my ($request,$problem,$result) = @_;
- my $fileout = &Apache::lonnet::filelocation("",$request->uri);
- my $filesave=$fileout.".bak";
+ my $file = &Apache::lonnet::filelocation("",$request->uri);
+ my $filebak =$file.".bak";
+ my $filetmp =$file.".tmp";
my $error=0;
if ($ENV{'form.Undo'} eq 'undo') {
- if (copy($filesave,$fileout)) {
- $request->print("Undid changes, Copied $filesave to $fileout
");
+ my $error=0;
+ if (!copy($file,$filetmp)) { $error=1; }
+ if ((!$error) && (!copy($filebak,$file))) { $error=1; }
+ if ((!$error) && (!move($filetmp,$filebak))) { $error=1; }
+ if (!$error) {
+ $request->print("Undid changes, Switched $filebak and $file
");
} else {
- $request->print("Unable to undo, unable to copy $filesave to $fileout
");
+ $request->print("Unable to undo, unable to switch $filebak and $file
");
$error=1;
}
} else {
- my $fs=Apache::File->new(">$filesave");
+ my $fs=Apache::File->new(">$filebak");
if (defined($fs)) {
print $fs $$problem;
- $request->print("Making Backup to $filesave
");
+ $request->print("Making Backup to $filebak
");
} else {
- $request->print("Unable to make backup $filesave");
+ $request->print("Unable to make backup $filebak");
$error=2;
}
- my $fh=Apache::File->new(">$fileout");
+ my $fh=Apache::File->new(">$file");
if (defined($fh)) {
print $fh $$result;
- $request->print("Saving Modifications to $fileout
");
+ $request->print("Saving Modifications to $file
");
} else {
- $request->print("Unable to write to $fileout");
+ $request->print("Unable to write to $file");
$error|=4;
}
}
return $error;
}
+sub analyze {
+ my ($request,$file) = @_;
+ &Apache::lonxml::debug("Analyze");
+ my $result=&Apache::lonnet::ssi($request->uri,('grade_target' => 'analyze'));
+ &Apache::lonxml::debug(":$result:");
+ (my $garbage,$result)=split(/_HASH_REF__/,$result,2);
+ &showhash(&Apache::lonnet::str2hash($result));
+ return $result;
+}
+
sub editxmlmode {
my ($request,$file) = @_;
my $result;
@@ -269,7 +317,7 @@ sub editxmlmode {
+ &HTML::Entities::encode($problem).'