--- loncom/homework/lonhomework.pm	2003/05/16 17:41:17	1.128
+++ loncom/homework/lonhomework.pm	2003/05/19 21:05:23	1.130
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.128 2003/05/16 17:41:17 albertel Exp $
+# $Id: lonhomework.pm,v 1.130 2003/05/19 21:05:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -214,9 +214,13 @@ sub check_access {
     my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
     if ( $tries eq '' ) { $tries = '0'; }
     if ( $maxtries eq '' ) { $maxtries = '2'; } 
-    if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } 
-    if($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/
-      && lc($Apache::lonhomework::problemstatus) ne 'no') {
+    if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }
+    # if (correct and show prob status) or excused then CANNOT_ANSWER
+    if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/
+	&&
+	lc($Apache::lonhomework::problemstatus) ne 'no')
+       ||
+       $Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) {
 	$status = 'CANNOT_ANSWER';
     }
   }
@@ -394,7 +398,7 @@ sub analyze {
 						 'last problem');
 	my $subresult=&Apache::lonnet::ssi($request->uri,
 					   ('grade_target' => 'analyze'),
-					   ('rndseed' => $i));
+					   ('rndseed' => $i+$rndseed));
 	&Apache::lonxml::debug(":$subresult:");
 	(my $garbage,$subresult)=split(/_HASH_REF__/,$subresult,2);
 	my %analyze=&Apache::lonnet::str2hash($subresult);
@@ -417,16 +421,27 @@ sub analyze {
     foreach my $part (keys(%allparts)) {
 	if (defined(@{ $overall{$part.'.answer'} })) {
 	    $request->print('<table><tr><td>Part '.$part.'</td></tr>');
+	    my %frequency;
 	    foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) {
-		$request->print('<tr><td>'.join('</td><td>',@{ $answer }).
-				'</td></tr>');
+		$frequency{join('\0',@{ $answer })}++;
+	    }
+	    foreach my $answer (sort {(split('\0',$a))[0] <=> (split('\0',$b))[0]} (keys(%frequency))) {
+		$request->print('<tr><td>'.
+				join('</td><td>',split('\0',$answer)).
+				'</td><td>('.$frequency{$answer}.
+				')</td></tr>');
 	    }
 	    $request->print('</table>');
 	} else {
 	    $request->print('<p>Part '.$part.
-			    ' is not analyzabale at this time</p>');
+			    ' is not analyzable at this time</p>');
 	}
     }
+    if (scalar(keys(%allparts)) == 0 ) {
+	$request->print('<p>Found no analyzable parts in this problem,
+                         currently only Numerical, Formula and String response
+                         styles are supported.</p>');
+    }
     &Apache::lonhtmlcommon::Close_PrgWin($request,\%prog_state);
     &analyze_footer($request);
     &Apache::lonhomework::showhash(%overall);
@@ -659,7 +674,7 @@ sub handler {
 	&renderpage($request,$file);
       } elsif ($ENV{'form.problemmode'} eq 'EditXML') {
 	&editxmlmode($request,$file);
-      } elsif ($ENV{'form.problemmode'} eq 'Answer Distribution') {
+      } elsif ($ENV{'form.problemmode'} eq 'Calculate answers') {
 	&analyze($request,$file);
       } else {
 	&renderpage($request,$file);