--- loncom/homework/grades.pm 2003/06/18 17:37:46 1.100 +++ loncom/homework/grades.pm 2003/06/18 18:59:20 1.101 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.100 2003/06/18 17:37:46 bowersj2 Exp $ +# $Id: grades.pm,v 1.101 2003/06/18 18:59:20 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2597,7 +2597,6 @@ sub getSymbMap { my $countProblems = 0; $mapiterator->next(); # skip the first BEGIN_MAP my $mapcurRes = $mapiterator->next(); # for "current resource" - my $ctr=0; while ($mapdepth > 0) { if($mapcurRes == $mapiterator->BEGIN_MAP) { $mapdepth++; } if($mapcurRes == $mapiterator->END_MAP) { $mapdepth--; } @@ -2668,10 +2667,10 @@ sub displayPage { ' No '. ' '.($ENV{'form.vProb'} eq 'no' ? 'Title' : 'Problem View').'/Grade'; - my ($depth,$ctr,$question) = (1,0,1); + my ($depth,$question) = (1,1); $iterator->next(); # skip the first BEGIN_MAP my $curRes = $iterator->next(); # for "current resource" - while ($depth > 0 && $ctr < 100) { # ctr, just in case it never gets out of loop + while ($depth > 0) { if($curRes == $iterator->BEGIN_MAP) { $depth++; } if($curRes == $iterator->END_MAP) { $depth--; } @@ -2756,7 +2755,6 @@ sub displayPage { } $curRes = $iterator->next(); - $ctr++; } $navmap->untieHashes(); @@ -2804,8 +2802,8 @@ sub updateGradeByPage { $iterator->next(); # skip the first BEGIN_MAP my $curRes = $iterator->next(); # for "current resource" - my ($depth,$ctr,$question,$changeflag)= (1,0,1,0); - while ($depth > 0 && $ctr < 100) { # ctr, just in case it never gets out of loop + my ($depth,$question,$changeflag)= (1,1,0); + while ($depth > 0) { if($curRes == $iterator->BEGIN_MAP) { $depth++; } if($curRes == $iterator->END_MAP) { $depth--; } @@ -2867,7 +2865,6 @@ sub updateGradeByPage { } $curRes = $iterator->next(); - $ctr++; } $navmap->untieHashes();