--- loncom/homework/lonhomework.pm 2001/08/29 10:18:10 1.59
+++ loncom/homework/lonhomework.pm 2002/02/28 01:18:47 1.72
@@ -1,4 +1,30 @@
+# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
+#
+# $Id: lonhomework.pm,v 1.72 2002/02/28 01:18:47 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
# Guy Albertelli
# 11/30 Gerd Kortemeyer
# 6/1,8/17,8/18 Gerd Kortemeyer
@@ -8,6 +34,7 @@ use strict;
use Apache::style;
use Apache::lonxml;
use Apache::lonnet;
+use Apache::lonplot;
use Apache::inputtags;
use Apache::structuretags;
use Apache::randomlabel;
@@ -17,30 +44,35 @@ use Apache::outputtags;
use Apache::Constants qw(:common);
#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.submitted'}) {
+ 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.preview'}) {
- if ( defined $ENV{'form.submitted'}) {
+ if ( defined($ENV{'form.preview'})) {
+ if ( defined($ENV{'form.submitted'})) {
return ('grade', 'web');
} else {
return ('web');
}
} else {
if ( $ENV{'form.problemmode'} eq 'View' ) {
- if ( defined $ENV{'form.submitted'}) {
- return ('grade', 'web');
+ if ( defined($ENV{'form.submitted'}) &&
+ (!defined($ENV{'form.resetdata'})) ) {
+ return ('grade', 'web','answer');
} else {
- return ('web');
+ return ('web','answer');
}
} elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {
if ( $ENV{'form.submitted'} eq 'edit' ) {
@@ -176,6 +208,9 @@ sub setupheader {
} else {
$request->content_type('text/html');
}
+ 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 ''
@@ -183,37 +218,80 @@ 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 editxmlmode {
+ my ($request,$file) = @_;
+ my $result;
+ my $problem=&Apache::lonnet::getfile($file);
+ if ($problem == -1) {
+ &Apache::lonxml::error(" Unable to find $file");
+ $problem='';
+ }
+ if (defined($ENV{'form.editxmltext'}) || defined($ENV{'form.Undo'})) {
+ my $error=&handle_save_or_undo($request,\$problem,
+ \$ENV{'form.editxmltext'});
+ if (!$error) { $problem=&Apache::lonnet::getfile($file); }
+ }
+ my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
+ if ($cols > 80) { $cols = 80; }
+ $result.='
+ ';
+ $request->print($result);
+ return '';
}
sub renderpage {
my ($request,$file) = @_;
my (@targets) = &get_target();
+ &Apache::lonxml::debug("Running targets ".join(':',@targets));
foreach my $target (@targets) {
#my $t0 = [&gettimeofday()];
my $problem=&Apache::lonnet::getfile($file);
@@ -229,20 +307,20 @@ sub renderpage {
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); }
+ #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='';
}
+ &Apache::lonxml::debug("Should be parsing now");
$result = &Apache::lonxml::xmlparse($target, $problem,
$default.&setup_vars($target),%mystyle);
@@ -281,24 +359,44 @@ sub get_template_list {
}
sub newproblem {
- my ($request) = @_;
-
- my $extension=$request->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(<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,$dest);
+ } elsif($ENV{'form.newfile'}) {
+ # I don't like hard-coded filenames but for now, this will work.
+ use File::Copy;
+ my $templatefilename =
+ $request->dir_config('lonIncludes').'/templates/blank.problem';
+ &Apache::lonxml::debug("$templatefilename");
+ my $dest = &Apache::lonnet::filelocation("",$request->uri);
+ copy($templatefilename,$dest);
+ &renderpage($request,$dest);
+ }else {
+ my $templatelist=&get_template_list('',$extension);
+ my $url=$request->uri;
+ my $dest = &Apache::lonnet::filelocation("",$request->uri);
+ if (!defined($templatelist)) {
+ # We didn't find a template, so just create a blank problem.
+ $request->print(<
+The requested file $url doesn\'t exist. You can create a new $extension
+
+
+ENDNEWPROBLEM
+ return '';
+ }
+ $request->print(<