--- loncom/homework/lonhomework.pm 2001/11/29 18:36:59 1.63 +++ loncom/homework/lonhomework.pm 2001/12/06 16:19:05 1.65 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.63 2001/11/29 18:36:59 albertel Exp $ +# $Id: lonhomework.pm,v 1.65 2001/12/06 16:19:05 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -203,7 +203,7 @@ sub setupheader { } else { $request->content_type('text/html'); } - &Apache::loncommon::no_cache($request); + if (!$Apache::lonxml::debug) { &Apache::loncommon::no_cache($request); } $request->send_http_header; return OK if $request->header_only; return '' @@ -213,12 +213,14 @@ sub handle_save_or_undo { my ($request,$problem,$result) = @_; my $fileout = &Apache::lonnet::filelocation("",$request->uri); my $filesave=$fileout.".bak"; + my $error=0; if ($ENV{'form.Undo'} eq 'undo') { if (copy($filesave,$fileout)) { $request->print("Undid changes, Copied $filesave to $fileout
"); } else { $request->print("Unable to undo, unable to copy $filesave to $fileout
"); + $error=1; } } else { my $fs=Apache::File->new(">$filesave"); @@ -227,6 +229,7 @@ sub handle_save_or_undo { $request->print("Making Backup to $filesave
"); } else { $request->print("Unable to make backup $filesave"); + $error=2; } my $fh=Apache::File->new(">$fileout"); if (defined($fh)) { @@ -234,8 +237,42 @@ sub handle_save_or_undo { $request->print("Saving Modifications to $fileout
"); } else { $request->print("Unable to write to $fileout"); + $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 { @@ -263,7 +300,7 @@ sub renderpage { } #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) { @@ -308,24 +345,43 @@ 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 = + "/home/httpd/html/res/adm/includes/templates/blank.problem"; + 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(< -The request file $url doesn\'t exist. You can create a new $extension
+The requested file $url doesn\'t exist. You can create a new $extension