--- loncom/interface/Attic/lonchart.pm	2001/11/28 17:52:00	1.18
+++ loncom/interface/Attic/lonchart.pm	2001/11/28 18:29:53	1.21
@@ -15,7 +15,7 @@
 # 7/10/01 Behrouz Minaei
 # 9/8 Gerd Kortemeyer
 # 10/18/01, 10/19/01 Behrouz Minaei
-# 11/17/01, 11/22/01, 11/24/01 Behrouz Minaei
+# 11/17/01, 11/22/01, 11/24/01, 11/28/01 Behrouz Minaei
 
 package Apache::lonchart;
 
@@ -106,13 +106,9 @@ sub ExtractStudentData {
 			if (($Key=~/\.(\w+)\.solved$/) && ($Key!~/^\d+\:/)) {
 			    my $Part = $1;
 			    $Tries = $result{"$Version:$Prob:resource.$Part.tries"};
-			    #if ($Tries) {$TempHash{"$Part.Tries"}=$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='*';
-                                $TempHash{$Part.'.Tries'}=$Tries;
-                            } 
+			    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 = '-';}
@@ -120,22 +116,22 @@ sub ExtractStudentData {
 			    else {$Code = ' ';}
 			    $TempHash{"$Part.Code"} = $Code;
 #            if ($test=~/*minaeibi*/) {
-		$r->print($Key."  PartNo =$PartNo "." Tries=$Tries!<br>$Version:$Prob:resource.$Part.tries".' = '.$result{"$Version:$Prob:resource.$Part.tries"}."  $Val "."($Code)".'<br>');
+#		$r->print($Key."  PartNo =$PartNo "." Tries=$Tries!<br>$Version:$Prob:resource.$Part.tries".' = '.$result{"$Version:$Prob:resource.$Part.tries"}."  $Val "."($Code)".'<br>');
 #	    }
 			}
       		    }
                 } 
-
 		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'};
-		    $r->print($n.") Part=".$part."  code=$TempHash{$part.'.Code'}<br>");
+		    $Str .= $TempHash{"$part.Code"};
+#		    $r->print($n.") Part=".$part."  code=$TempHash{$part.'.Code'}<br>");
 		}
             }   
 	    else {for(my $n=0; $n<$PartNo; $n++) {$Str.=' ';}}