[LON-CAPA-cvs] cvs: rat / lonpage.pm loncom/interface lonnavmaps.pm

www lon-capa-cvs@mail.lon-capa.org
Sun, 01 Sep 2002 19:29:01 -0000


www		Sun Sep  1 15:29:01 2002 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm 
    /rat	lonpage.pm 
  Log:
  Fixing bug #675.
  
  Removed what appears to be a perfectly idiotic hack. I truly wish I knew why
  it was in there. Hoping this did not break anything else.
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.43 loncom/interface/lonnavmaps.pm:1.44
--- loncom/interface/lonnavmaps.pm:1.43	Wed Aug 21 13:18:08 2002
+++ loncom/interface/lonnavmaps.pm	Sun Sep  1 15:29:00 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.43 2002/08/21 17:18:08 www Exp $
+# $Id: lonnavmaps.pm,v 1.44 2002/09/01 19:29:00 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -339,7 +339,7 @@
     my ($sofar,$rid,$beenhere,$showtypes,$indent,$linkid)=@_;
     my $newshowtypes=$showtypes;
     my $further=$sofar;
-    #$Apache::lonxml::debug=1;
+# $Apache::lonxml::debug=1;
     &Apache::lonxml::debug("$rid ; $linkid ; $sofar ; $beenhere ; ".$hash{'src_'.$rid});
     if ($beenhere=~/\&$rid\&/) { return $further; }
     $beenhere.=$rid.'&';
@@ -491,13 +491,7 @@
 
 	@rows=();
 
-	&tracetable(0,$firstres,'&'.$lastres.'&','',0);
-	if ($hash{'src_'.$lastres}) {
-	    my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$lastres});
-	    if (($brepriv eq '2') || ($brepriv eq 'F')) {
-		$rows[$#rows+1]=''.$lastres;
-	    }
-	}
+	&tracetable(0,$firstres,'&','',0);
 
 # ------------------------------------------------------------------ Page parms
 
Index: rat/lonpage.pm
diff -u rat/lonpage.pm:1.44 rat/lonpage.pm:1.45
--- rat/lonpage.pm:1.44	Mon Aug 12 14:21:42 2002
+++ rat/lonpage.pm	Sun Sep  1 15:29:01 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.44 2002/08/12 18:21:42 albertel Exp $
+# $Id: lonpage.pm,v 1.45 2002/09/01 19:29:01 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -171,14 +171,7 @@
 
                   @rows=();
 
-                  &tracetable(0,$firstres,'&'.$lastres.'&');
-                  if ($hash{'src_'.$lastres}) {
-                     my $brepriv=
-                        &Apache::lonnet::allowed('bre',$hash{'src_'.$lastres});
-                     if (($brepriv eq '2') || ($brepriv eq 'F')) {
-                        $rows[$#rows+1]=''.$lastres;
-		     }
-		  }
+                  &tracetable(0,$firstres,'&');
 
 # ------------------------------------------------------------ Add to symb list