--- loncom/homework/lonhomework.pm 2002/03/22 20:11:00 1.73
+++ 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.73 2002/03/22 20:11:00 albertel Exp $
+# $Id: lonhomework.pm,v 1.79 2002/05/24 18:55:23 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -61,6 +61,9 @@ sub get_target {
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');
@@ -189,21 +192,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");
@@ -270,6 +281,16 @@ sub handle_save_or_undo {
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;
@@ -319,8 +340,10 @@ sub renderpage {
my $result = '';
&Apache::inputtags::initialize_inputtags;
&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
");
@@ -329,6 +352,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) {
@@ -336,13 +360,17 @@ 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:");
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);
+ }
#my $td=&tv_interval($t0);
#if ( $Apache::lonxml::debug) {
#$result =~ s: