--- loncom/homework/lonhomework.pm 2002/03/29 18:32:46 1.74
+++ loncom/homework/lonhomework.pm 2002/06/26 17:20:38 1.81
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.74 2002/03/29 18:32:46 albertel Exp $
+# $Id: lonhomework.pm,v 1.81 2002/06/26 17:20:38 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -80,7 +80,11 @@ sub get_target {
}
} elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {
if ( $ENV{'form.submitted'} eq 'edit' ) {
- return ('modified','edit');
+ if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) {
+ return ('modified','web','answer');
+ } else {
+ return ('modified','edit');
+ }
} else {
return ('edit');
}
@@ -192,21 +196,29 @@ sub check_access {
sub showhash {
my (%hash) = @_;
+ &showhashsubset(\%hash,'');
+ return '';
+}
+
+sub showhashsubset {
+ my ($hash,$keyre) = @_;
my $resultkey;
- foreach $resultkey (sort keys %hash) {
- if (ref($hash{$resultkey})) {
- if ($hash{$resultkey} =~ /ARRAY/ ) {
- my $string="$resultkey ---- (";
- foreach my $elm (@{ $hash{$resultkey} }) {
- $string.="$elm,";
+ 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}");
}
- chop($string);
- &Apache::lonxml::debug("$string)");
} else {
- &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}");
+ &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");
}
- } else {
- &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}");
}
}
&Apache::lonxml::debug("\n
restored values^\n");
@@ -296,22 +308,30 @@ sub editxmlmode {
\$ENV{'form.editxmltext'});
if (!$error) { $problem=&Apache::lonnet::getfile($file); }
}
- my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
- if ($cols > 80) { $cols = 80; }
- $result.='
+ &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);
+ if ($cols > 80) { $cols = 80; }
+ $result.='
';
- $request->print($result);
+ $request->print($result);
+ }
return '';
}
@@ -334,7 +354,8 @@ sub renderpage {
&Apache::edit::initialize_edit;
if ($target eq 'analyze') { %Apache::lonhomework::anaylze=(); }
if ($target eq 'web') {
- if (&Apache::lonnet::symbread() eq '') {
+ my ($symb)=&Apache::lonxml::whichuser();
+ if ($symb eq '') {
if ($ENV{'request.state'} eq "construct") {
} else {
$request->print("Browsing or ambiguous reference, submissions ignored
");
@@ -343,6 +364,7 @@ sub renderpage {
#if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }
}
#if ($target eq 'grade') { &showhash(%Apache::lonhomework::history); }
+ #if ($target eq 'web') { &showhash(%ENV); }
my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm');
if ($default == -1) {
@@ -350,7 +372,7 @@ sub renderpage {
$default='';
}
&Apache::lonxml::debug("Should be parsing now");
- $result = &Apache::lonxml::xmlparse($target, $problem,
+ $result = &Apache::lonxml::xmlparse($request, $target, $problem,
$default.&setup_vars($target),%mystyle);
#$request->print("Result follows:");
@@ -359,6 +381,7 @@ sub renderpage {
} else {
if ($target eq 'analyze') {
$result=&Apache::lonnet::hashref2str(\%Apache::lonhomework::analyze);
+ undef(%Apache::lonhomework::analyze);
}
#my $td=&tv_interval($t0);
#if ( $Apache::lonxml::debug) {
@@ -469,8 +492,10 @@ sub handler {
&Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");
# some times multiple problemmodes are submitted, need to select
# the last one
+ &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'});
if ( defined($ENV{'form.problemmode'}) &&
- defined(@{ $ENV{'form.problemmode'} })) {
+ ref($ENV{'form.problemmode'}) ) {
+ &Apache::lonxml::debug("Problem Mode ".join(",",@$ENV{'form.problemmode'}));
my $mode=$ENV{'form.problemmode'}->[-1];
undef $ENV{'form.problemmode'};
$ENV{'form.problemmode'}=$mode;