--- loncom/homework/lonhomework.pm 2001/02/13 18:42:06 1.37
+++ loncom/homework/lonhomework.pm 2002/11/12 05:05:26 1.101
@@ -1,38 +1,109 @@
+# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
+#
+# $Id: lonhomework.pm,v 1.101 2002/11/12 05:05:26 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 Gerd Kortemeyer
+# 6/1,8/17,8/18 Gerd Kortemeyer
+# 7/18 Jeremy Bowers
package Apache::lonhomework;
use strict;
-use Apache::style;
-use Apache::lonxml;
-use Apache::lonnet;
-use Apache::inputtags;
-use Apache::structuretags;
-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::caparesponse();
+use Apache::radiobuttonresponse();
+use Apache::optionresponse();
+use Apache::imageresponse();
+use Apache::essayresponse();
+use Apache::externalresponse();
use Apache::Constants qw(:common);
+use HTML::Entities();
+use Apache::loncommon();
+#use Time::HiRes qw( gettimeofday tv_interval );
+
+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'} )
+ && ($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 {
return ('web');
}
} elsif ($ENV{'request.state'} eq "construct") {
- if ( defined $ENV{'form.preview'}) {
- if ( defined $ENV{'form.submitted'}) {
+ if ( defined($ENV{'form.grade_target'}) ) {
+ return ($ENV{'form.grade_target'});
+ }
+ if ( defined($ENV{'form.preview'})) {
+ if ( defined($ENV{'form.submitted'})) {
return ('grade', 'web');
} else {
return ('web');
}
} else {
- #return ('edit');
- #edit is currently broken
- return ('web');
+ if ( $ENV{'form.problemmode'} eq 'View' ||
+ $ENV{'form.problemmode'} eq 'Discard Edits and View') {
+ if ( defined($ENV{'form.submitted'}) &&
+ (!defined($ENV{'form.resetdata'})) ) {
+ return ('grade', 'web','answer');
+ } else {
+ return ('web','answer');
+ }
+ } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {
+ if ( $ENV{'form.submitted'} eq 'edit' ) {
+ if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) {
+ return ('modified','web','answer');
+ } else {
+ return ('modified','edit');
+ }
+ } else {
+ return ('edit');
+ }
+ } else {
+ return ('web');
+ }
}
}
return ();
@@ -47,7 +118,6 @@ sub setup_vars {
sub send_header {
my ($request)= @_;
$request->print(&Apache::lontexconvert::header());
- $ENV{'request.uri'}=$request->uri;
# $request->print('';
+ $request->print($result);
+ $request->rflush();
+}
+
+sub analyze {
+ my ($request,$file) = @_;
+ &Apache::lonxml::debug("Analyze");
+ my $result;
+ my %overall;
+ my %allparts;
+ my $rndseed=$ENV{'form.rndseed'};
+ srand($rndseed);
+ &analyze_header($request);
+ for(my $i;$i<$ENV{'form.numtoanalyze'};$i++) {
+ my $subresult=&Apache::lonnet::ssi($request->uri,
+ ('grade_target' => 'analyze'),
+ ('rndseed' => rand));
+ #&Apache::lonxml::debug(":$subresult:");
+ (my $garbage,$subresult)=split(/_HASH_REF__/,$subresult,2);
+ my %analyze=&Apache::lonnet::str2hash($subresult);
+ &Apache::lonhomework::showhash(%analyze);
+ my @parts = @{ $analyze{'parts'} };
+ foreach my $part (@parts) {
+ if (!exists($allparts{$part})) {$allparts{$part}=1;};
+ if ($analyze{$part.'.type'} eq 'numericalresponse') {
+ push( @{ $overall{$part.'.answer'} },
+ [@{ $analyze{$part.'.answer'} }]);
+ }
+ }
}
+ foreach my $part (keys(%allparts)) {
+ $request->print('| Part '.$part.' |
');
+ foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) {
+ $request->print('| '.join(' | ',@{ $answer }).
+ ' |
');
+ }
+ }
+ &Apache::lonhomework::showhash(%overall);
+ return $result;
+}
+
+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); }
+ }
+ &Apache::lonhomework::showhashsubset(\%ENV,'^form');
+ if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) {
+ &Apache::lonhomework::showhashsubset(\%ENV,'^form');
+ $ENV{'form.problemmode'}='View';
+ &renderpage($request,$file);
+ } else {
+ my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
+ my $xml_help = Apache::loncommon::help_open_topic("Problem_Editor_XML_Index");
+ if ($cols > 80) { $cols = 80; }
+ if ($cols < 70) { $cols = 70; }
+ if ($rows < 20) { $rows = 20; }
+ $result.='
+ ';
+ $request->print($result);
}
+ return '';
+}
+
+sub renderpage {
+ my ($request,$file) = @_;
- &Apache::lonhomework::send_header($request);
-
+ my (@targets) = &get_target();
+ &Apache::lonxml::debug("Running targets ".join(':',@targets));
foreach my $target (@targets) {
- my $file=&Apache::lonnet::filelocation("",$request->uri);
+ #my $t0 = [&gettimeofday()];
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') {
- 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
");
- }
+ &Apache::inputtags::initialize_inputtags();
+ &Apache::outputtags::initialize_outputtags();
+ &Apache::edit::initialize_edit();
+ if ($target eq 'analyze') { %Apache::lonhomework::anaylze=(); }
+ if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); }
+ if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%ENV,'^form');}
+
+ &Apache::lonxml::debug("Should be parsing now");
+ $result = &Apache::lonxml::xmlparse($request, $target, $problem,
+ &setup_vars($target),%mystyle);
+
+ #$request->print("Result follows:");
+ if ($target eq 'modified') {
+ &handle_save_or_undo($request,\$problem,\$result);
+ } else {
+ if ($target eq 'analyze') {
+ $result=&Apache::lonnet::hashref2str(\%Apache::lonhomework::analyze);
+ undef(%Apache::lonhomework::analyze);
}
- if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }
+ #my $td=&tv_interval($t0);
+ #if ( $Apache::lonxml::debug) {
+ #$result =~ s:::;
+ #$result.="
Spent $td seconds processing target $target\n";
+ #}
+ $request->print($result);
}
- 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");
+ #$request->print(":Result ends");
+ #my $td=&tv_interval($t0);
+ }
+}
+
+# with no arg it returns a HTML \n';
+ }
+ return $result;
+}
+
+sub newproblem {
+ my ($request) = @_;
+ my $extension=$request->uri;
+ $extension=~s:^.*\.([\w]+)$:$1:;
+ &Apache::lonxml::debug("Looking for :$extension:");
+ if ($ENV{'form.template'} &&
+ $ENV{'form.template'} ne "Select a $extension type") {
+ 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);
+ my $instructions;
+ if ($templatelist) { $instructions=", select a template from the pull-down menu below. Then";}
+ $request->print(<
+The requested file $url doesn\'t exist.
+To create a new $extension$instructions click on the Create $extension button.
+
");
}
- $result = &Apache::lonxml::xmlparse($target, $problem,
- $default.&setup_vars($target),%mystyle);
+ return '';
+}
- #$request->print("Result follows:");
- $request->print($result);
- #$request->print(":Result ends");
- if ($target eq 'grade') {
+sub view_or_edit_menu {
+ my ($request) = @_;
+ my $url=$request->uri;
+ $request->print(<