--- loncom/interface/Attic/lonchart.pm	2001/09/08 19:16:01	1.6
+++ loncom/interface/Attic/lonchart.pm	2001/10/18 14:25:49	1.7
@@ -17,6 +17,7 @@
 #
 # 7/10/01 Behrouz Minaei
 # 9/8 Gerd Kortemeyer
+# 10/18/01 Behrouz Minaei
 
 package Apache::lonchart;
 
@@ -44,7 +45,9 @@ sub ExtractStudentData {
     my $Code;
     my $Tries;
     my $Wrongs;
+    my %TempHash;
     my $Version;
+    my $LatestVersion;            
                 
     my $Str=substr($students[$index].
             '                                                        ',0,14).' ! '.
@@ -64,77 +67,51 @@ sub ExtractStudentData {
                        &Apache::lonnet::declutter( $hash{'src_'.$ResId} );
             $Code=' ';
             $Tries = 0;
-  	    $Version = $result{"version:$Prob"};            
-            if ( $Version ) {
-                my $vkeys = $result{"$Version:keys:$Prob"};
-                my @keys = split(/:/,$vkeys);
-                foreach my $Key (@keys) {
-                    if (($Key=~/\.(\w+)\.solved$/) && ($Key!~/^\d+\:/)) {
-                        my $Part = $1;
-                        $Tries = $result{"$Version:$Prob:resource.$Part.tries"};
-                        my $Val = $result{"$Version:$Prob:$Key"};
-	                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';}
+  	    $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;  
+				$PartNo++;
+			    }
+			    $TempHash{"$Part.Tries"} = $result{"$Version:$Prob:resource.$Part.tries"};
+			    $Tries = $result{"$Version:$Prob:resource.$Part.tries"};
+			    my $Val = $result{"$Version:$Prob:$Key"};
+			    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';}
+			    $TempHash{"$Part.Code"} = $Code;
+			}
       		    }
-                    if (($Code eq '*')&&($Tries<10)){$Code=$Tries;}
                 } 
+
+		for ( my $n = 0; $n < $PartNo; $n++ ) {		  
+		    my $part = $TempHash{$n};
+                    if (($TempHash{$part.'.Code'} eq '*')&&
+                        ($TempHash{$part.'.Tries'}<10)) {
+                        $TempHash{$part.'.Code'}=$Tries;
+                    }
+		    $Str .= $TempHash{$part.'.Code'}; 
+		}
             }   
-            $Str .= $Code; 
         } 
     }
     return $Str;
 }
 
-#sub astatus {
-#    my ($rid,$student)=@_;
-#    my ($uname,$udom)=split(/\:/,$student);
-#    my $code=' ';
-#    $rid=~/(\d+)\.(\d+)/;
-#    my $symb=&Apache::lonnet::declutter($hash{'map_id_'.$1}).'___'.$2.'___'.
-#	     &Apache::lonnet::declutter($hash{'src_'.$rid});
-#    my $answer=&Apache::lonnet::reply(
-#              "restore:$udom:$uname:".
-#              $ENV{'request.course.id'}.':'.
-#              &Apache::lonnet::escape($symb),
-#              &Apache::lonnet::homeserver($uname,$udom));
-#    my %returnhash=();
-#    map {
-#	my ($name,$value)=split(/\=/,$_);
-#        $returnhash{&Apache::lonnet::unescape($name)}=
-#                    &Apache::lonnet::unescape($value);
-#    } split(/\&/,$answer);
-#    if ($returnhash{'version'}) {
-#       my $version;
-#       for ($version=1;$version<=$returnhash{'version'};$version++) {
-#          map {
-#             $returnhash{$_}=$returnhash{$version.':'.$_};
-#          } split(/\:/,$returnhash{$version.':keys'});
-#       }
-#       my $totaltries=0;
-#       map {
-#           if (($_=~/\.(\w+)\.solved$/) && ($_!~/^\d+\:/)) {
-#               my $part=$1;
-#	       if ($returnhash{$_} eq 'correct_by_student') {
-#                   unless (($code eq '.') || ($code eq '-')) { $code='*'; }
-#                   $totaltries+=$returnhash{'resource.'.$part.'.tries'};
-#               } elsif ($returnhash{$_} eq 'correct_by_override') {
-#                   unless (($code eq '.') || ($code eq '-')) { $code='+'; }
-#               } elsif ($returnhash{$_} eq 'incorrect_attempted') {
-#                   $code='.';
-#               } elsif ($returnhash{$_} eq 'incorrect_by_override') {
-#                   $code='-';
-#               } elsif ($returnhash{$_} eq 'excused') {
-#                   unless (($code eq '.') || ($code eq '-')) { $code='x'; }
-#               }
-#           }
-#       } keys %returnhash;
-#       if (($code eq '*') && ($totaltries<10)) { $code="$totaltries"; }
-#    }
-#    return $code;
-#}
 
 # ------------------------------------------------------------ Build page table
 
@@ -142,9 +119,10 @@ sub tracetable {
     my ($rid,$beenhere)=@_;
     unless ($beenhere=~/\&$rid\&/) {
        $beenhere.=$rid.'&';  
+# new ... updating the map according to sequence and page
        if (defined($hash{'is_map_'.$rid})) {
-           if ($hash{'map_type_'.$hash{'map_pc_'.$hash{'src_'.$rid}}} 
-            eq 'sequence') { 
+	   my $cmap=$hash{'map_type_'.$hash{'map_pc_'.$hash{'src_'.$rid}}};
+           if ( $cmap eq 'sequence' || $cmap eq 'page' ) { 
                $cols[$#cols+1]=0; 
            }
            if ((defined($hash{'map_start_'.$hash{'src_'.$rid}})) &&
@@ -310,19 +288,6 @@ sub handler {
                           $r->print('<p><pre>');
  			  my $index;
                            for ($index=0;$index<=$#students;$index++) {
-#                              $r->print(
-#                                       substr($students[$index].
-#       '                                                        ',0,14).' ! '.
-#        			       substr($rowlabels[$index].
-#       '                                                        ',0,45).' ! ');
-                             # map {
-                             #     if ($_) {
-                             #        $r->print(&astatus($_,$students[$index]));
-                             #     } else {
-                             #        $r->print(' ! ');
-                             #     }
-                             # } @cols;
-                             # $r->print("\n");
                               $r->print(&ExtractStudentData($index,$cid).'<br>');
                               $r->rflush();
                           }