[LON-CAPA-cvs] cvs: rat / lonpage.pm lonuserstate.pm

[albertel]

albertel		Fri Nov 30 14:14:15 2007 EDT

  Modified files:              
    /rat	lonpage.pm lonuserstate.pm 
  Log:
  - need to pass $beenhere along to detect map recursion 
  
  
Index: rat/lonpage.pm
diff -u rat/lonpage.pm:1.86 rat/lonpage.pm:1.87
--- rat/lonpage.pm:1.86	Tue Sep 25 20:32:55 2007
+++ rat/lonpage.pm	Fri Nov 30 14:14:14 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.86 2007/09/26 00:32:55 albertel Exp $
+# $Id: lonpage.pm,v 1.87 2007/11/30 19:14:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -78,7 +78,7 @@
                     my $frid=$hash{'map_finish_'.$hash{'src_'.$rid}};
 	            $sofar=
                        &tracetable($sofar,$hash{'map_start_'.$hash{'src_'.$rid}},
-                       '&'.$frid.'&');
+                       '&'.$frid.$beenhere);
                     $sofar++;
                     if ($hash{'src_'.$frid}) {
                         my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$frid});
Index: rat/lonuserstate.pm
diff -u rat/lonuserstate.pm:1.125 rat/lonuserstate.pm:1.126
--- rat/lonuserstate.pm:1.125	Tue Oct 16 17:14:53 2007
+++ rat/lonuserstate.pm	Fri Nov 30 14:14:14 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construct and maintain state and binary representation of course for user
 #
-# $Id: lonuserstate.pm,v 1.125 2007/10/16 21:14:53 albertel Exp $
+# $Id: lonuserstate.pm,v 1.126 2007/11/30 19:14:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -471,7 +471,8 @@
 	    if (defined($hash{'map_start_'.$hash{'src_'.$rid}})) {
 		$sofar=$newsofar=
 		    &traceroute($sofar,
-				$hash{'map_start_'.$hash{'src_'.$rid}},'&',
+				$hash{'map_start_'.$hash{'src_'.$rid}},
+				$beenhere,
 				$encflag || $encurl{$rid},
 				$hdnflag || $hiddenurl{$rid});
 	    }