--- loncom/homework/lonhomework.pm	2002/02/27 20:23:26	1.71
+++ loncom/homework/lonhomework.pm	2002/03/29 19:19:21	1.75
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.71 2002/02/27 20:23:26 albertel Exp $
+# $Id: lonhomework.pm,v 1.75 2002/03/29 19:19:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,17 +31,18 @@
 
 package Apache::lonhomework;
 use strict;
-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::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::Constants qw(:common);
+use HTML::Entities();
 #use Time::HiRes qw( gettimeofday tv_interval );
 
 BEGIN {
@@ -60,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');
@@ -128,6 +132,7 @@ sub check_access {
   my $type;
   my $passed;
   &Apache::lonxml::debug("checking for part :$id:");
+  &Apache::lonxml::debug("time:".time);
   foreach $temp ("opendate","duedate","answerdate") {
     $lastdate = $date;
     $date = &Apache::lonnet::EXT("resource.$id.$temp");
@@ -189,7 +194,20 @@ sub showhash {
   my (%hash) = @_;
   my $resultkey;
   foreach $resultkey (sort keys %hash) {
-    &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}");
+    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}");
+      }
+    } else {
+      &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}");
+    }
   }
   &Apache::lonxml::debug("\n<br />restored values^</br>\n");
   return '';
@@ -255,6 +273,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;
@@ -281,7 +309,7 @@ sub editxmlmode {
             <input type="submit" name="Undo" value="undo" />
             <hr />
             <textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
-	      $problem.'</textarea>
+	      &HTML::Entities::encode($problem).'</textarea>
             </form></body></html>';
   $request->print($result);
   return '';
@@ -304,6 +332,7 @@ 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 '') {
 	if ($ENV{'request.state'} eq "construct") {
@@ -328,6 +357,10 @@ sub renderpage {
     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:</body>::;
@@ -437,11 +470,11 @@ sub handler {
   &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");
   # some times multiple problemmodes are submitted, need to select
   # the last one
-  if ( defined @{ $ENV{'form.problemmode'} } ) {
-    &Apache::lonxml::debug("Problem Modes ".join(':',@{ $ENV{'form.problemmode'} }));
-    my @modes=@{ $ENV{'form.problemmode'} };
+  if ( defined($ENV{'form.problemmode'}) &&
+       defined(@{ $ENV{'form.problemmode'} })) {
+    my $mode=$ENV{'form.problemmode'}->[-1];
     undef $ENV{'form.problemmode'};
-    $ENV{'form.problemmode'}=$modes[-1];
+    $ENV{'form.problemmode'}=$mode;
   }
   &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'});
   my $file=&Apache::lonnet::filelocation("",$request->uri);
@@ -468,6 +501,8 @@ sub handler {
 	&renderpage($request,$file);
       } elsif ($ENV{'form.problemmode'} eq 'EditXML') {
 	&editxmlmode($request,$file);
+      } elsif ($ENV{'form.problemmode'} eq 'Answer Distribution') {
+	&analyze($request,$file);
       } else {
 	&renderpage($request,$file);
       }
@@ -477,6 +512,7 @@ sub handler {
     }
   } else {
     # just render the page normally outside of construction space
+    &Apache::lonxml::debug("not construct");
     &renderpage($request,$file);
   }
   #my $td=&tv_interval($t0);