--- loncom/interface/Attic/lonchart.pm	2001/11/22 17:05:07	1.11
+++ loncom/interface/Attic/lonchart.pm	2001/11/28 18:48:33	1.22
@@ -11,14 +11,11 @@
 # 08/30,08/31,09/06,09/14,09/15,09/16,09/19,09/20,09/21,09/23,
 # 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14,11/16 Gerd Kortemeyer)
 #
-# 3/1/1,6/1,17/1,29/1,30/1 Gerd Kortemeyer)
-#
-# 1/31 Gerd Kortemeyer
-#
+# 3/1/1,6/1,17/1,29/1,30/1,31/1 Gerd Kortemeyer)
 # 7/10/01 Behrouz Minaei
 # 9/8 Gerd Kortemeyer
 # 10/18/01, 10/19/01 Behrouz Minaei
-# 11/17/01, 11/22/01 Behrouz Minaei
+# 11/17/01, 11/22/01, 11/24/01, 11/28/01 Behrouz Minaei
 
 package Apache::lonchart;
 
@@ -33,7 +30,6 @@ my %hash;
 my @cols;
 my @rowlabels;
 my @students;
-my $r;
 
 # ------------------------------------------------------------- Find out status
 
@@ -51,8 +47,7 @@ sub ExtractStudentData {
     my $Version;
     my $ProbNo;
     my $PrTotal;
-    my $LatestVersion;            
-                
+    my $LatestVersion;                     
     my $Str=substr($students[$index].
             '                                                        ',0,14).' ! '.
             substr($rowlabels[$index].
@@ -76,8 +71,6 @@ sub ExtractStudentData {
 	    }
             $ResId=~/(\d+)\.(\d+)/;
 	    my $meta=$hash{'src_'.$ResId};
-# $r->print($m.'<br>');
-#	    $r->rflush();
 	    my $PartNo = 0;
 	    undef %TempHash;
 	    map {
@@ -92,13 +85,6 @@ sub ExtractStudentData {
 		}
             } split(/\,/,&Apache::lonnet::metadata($meta,'keys'));
 
-#	    foreach my $Key (%TempHash) {	
-#		$r->print($Key.' = '.$TempHash{$Key}.'<br>');
-#		$r->rflush();
-#	    }
-
-$r->print($PartNo.'<br>');$r->rflush();
-
             my $Prob = &Apache::lonnet::declutter( $hash{'map_id_'.$1} ).
                        '___'.$2.'___'.
                        &Apache::lonnet::declutter( $hash{'src_'.$ResId} );
@@ -106,44 +92,37 @@ $r->print($PartNo.'<br>');$r->rflush();
             $Tries = 0;
   	    $LatestVersion = $result{"version:$Prob"};
 
-	    #undef %TempHash;
-	    #my $PartNo = 0;
-            
             if ( $LatestVersion ) {
 		for ( my $Version=1; $Version<=$LatestVersion; $Version++ ) {
 		    my $vkeys = $result{"$Version:keys:$Prob"};
 		    my @keys = split(/\:/,$vkeys);		  
+
 		    foreach my $Key (@keys) {		  
 			if (($Key=~/\.(\w+)\.solved$/) && ($Key!~/^\d+\:/)) {
 			    my $Part = $1;
-			    #if ( $TempHash{"$Part"} eq '' ) { 
-			#	$TempHash{"$Part"} = $Part;
-				#$TempHash{$PartNo}=$Part;
-				#$TempHash{"$Part.Code"} = ' ';  
-				#$PartNo++;
-			    #}
-			    $TempHash{"$Part.Tries"} = $result{"$Version:$Prob:resource.$Part.tries"};
 			    $Tries = $result{"$Version:$Prob:resource.$Part.tries"};
-			    my $Val = $result{"$Version:$Prob:$Key"};
+			    $TempHash{"$Part.Tries"}=($Tries) ? $Tries : 0;
+			    my $Val = $result{"$Version:$Prob:resource.$Part.solved"};
 			    if ($Val eq 'correct_by_student'){$Code='*';} 
 			    elsif ($Val eq 'correct_by_override'){$Code = '+';}                        
 			    elsif ($Val eq 'incorrect_attempted'){$Code = '.';} 
 			    elsif ($Val eq 'incorrect_by_override'){$Code = '-';}
 			    elsif ($Val eq 'excused'){$Code = 'x';}
+			    else {$Code = ' ';}
 			    $TempHash{"$Part.Code"} = $Code;
 			}
       		    }
                 } 
-
 		for ( my $n = 0; $n < $PartNo; $n++ ) {		  
 		    my $part = $TempHash{$n};
-                    if ($TempHash{$part.'.Code'} eq '*') {
+                    if ($TempHash{"$part.Code"} eq '*') {
 			$ProbNo++;
-                        if ($TempHash{$part.'.Tries'}<10) {
-			    $TempHash{$part.'.Code'}=$Tries;
+                        if (($TempHash{"$part.Tries"}<10) ||
+                            ($TempHash{"$part.Tries"} eq '')) {
+			    $TempHash{"$part.Code"}=$TempHash{"$part.Tries"};
 			}
                     }
-		    $Str .= $TempHash{$part.'.Code'};
+		    $Str .= $TempHash{"$part.Code"};
 		}
             }   
 	    else {for(my $n=0; $n<$PartNo; $n++) {$Str.=' ';}}
@@ -202,7 +181,7 @@ sub tracetable {
 # ================================================================ Main Handler
 
 sub handler {
-  $r=shift;
+  my $r=shift;
 
   if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
 # ------------------------------------------- Set document type for header only