[LON-CAPA-cvs] cvs: loncom /homework grades.pm

[bowersj2]

bowersj2		Mon Jul 14 10:43:39 2003 EDT

  Modified files:              
    /loncom/homework	grades.pm 
  Log:
  Make the grades work with the top-level map for H.K.
  
  
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.113 loncom/homework/grades.pm:1.114
--- loncom/homework/grades.pm:1.113	Mon Jul 14 10:29:07 2003
+++ loncom/homework/grades.pm	Mon Jul 14 10:43:39 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.113 2003/07/14 14:29:07 ng Exp $
+# $Id: grades.pm,v 1.114 2003/07/14 14:43:39 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2668,7 +2668,7 @@
 
     # End navmap using boilerplate
 
-    my $iterator = Apache::lonnavmaps::iterator->new($navmap, undef, undef, undef, 1, undef, 1);
+    my $iterator = Apache::lonnavmaps::iterator->new($navmap, undef, undef, undef, undef, 1, undef, 1);
     my $depth = 1;
     my $curRes = $iterator->next();
 
@@ -2676,7 +2676,7 @@
     my @titles = ();
     my $minder=0;
     my $seenBeginMap = 0;
-    while ($depth > 0 && !$seenBeginMap) {
+    while ($depth > 0 || !$seenBeginMap) {
         if ($curRes == $iterator->BEGIN_MAP()) {$depth++; $seenBeginMap = 1; }
         if ($curRes == $iterator->END_MAP()) { $depth--; }