--- loncom/homework/lonhomework.pm	2003/05/16 17:41:17	1.128
+++ loncom/homework/lonhomework.pm	2003/06/13 20:50:57	1.134
@@ -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.134 2003/06/13 20:50:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -214,17 +214,21 @@ 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';
     }
   }
 
-  if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&
-      (!$Apache::lonhomework::history{"resource.0.outtoken"})) {
-      return ('UNCHECKEDOUT','needs to be checked out');
-  }
+  #if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&
+  #    (!$Apache::lonhomework::history{"resource.0.outtoken"})) {
+  #    return ('UNCHECKEDOUT','needs to be checked out');
+  #}
 
 
   &Apache::lonxml::debug("sending back :$status:$datemsg:");
@@ -394,8 +398,7 @@ sub analyze {
 						 'last problem');
 	my $subresult=&Apache::lonnet::ssi($request->uri,
 					   ('grade_target' => 'analyze'),
-					   ('rndseed' => $i));
-	&Apache::lonxml::debug(":$subresult:");
+					   ('rndseed' => $i+$rndseed));
 	(my $garbage,$subresult)=split(/_HASH_REF__/,$subresult,2);
 	my %analyze=&Apache::lonnet::str2hash($subresult);
 	my @parts;
@@ -414,19 +417,32 @@ sub analyze {
     }
     &Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state,
 					  'Analyzing Results');
-    foreach my $part (keys(%allparts)) {
+    foreach my $part (sort(keys(%allparts))) {
 	if (defined(@{ $overall{$part.'.answer'} })) {
-	    $request->print('<table><tr><td>Part '.$part.'</td></tr>');
+	    my $num_cols=scalar(@{ $overall{$part.'.answer'}->[0] });
+	    $request->print('<table><tr><td colspan="'.($num_cols+1).'">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 })}++;
+	    }
+	    $request->print('<tr><td colspan="'.($num_cols).'">Answer</td><td>Frequency</td></tr>');
+	    foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) {
+		$request->print('<tr><td align="right">'.
+				join('</td><td align="right">',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);
@@ -557,6 +573,7 @@ sub newproblem {
     my $extension=$request->uri;
     $extension=~s:^.*\.([\w]+)$:$1:;
     &Apache::lonxml::debug("Looking for :$extension:");
+    my $templatelist=&get_template_list('',$extension);
     if ($ENV{'form.template'} &&
 	$ENV{'form.template'} ne "Select a $extension template") {
 	use File::Copy;
@@ -564,8 +581,16 @@ sub newproblem {
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
 	copy($file,$dest);
 	&renderpage($request,$dest);
+    } elsif($ENV{'form.newfile'} && !$templatelist) {
+	# 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 $errormsg;
@@ -659,7 +684,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);