--- rat/lonuserstate.pm	2007/08/29 00:50:50	1.124
+++ rat/lonuserstate.pm	2007/12/01 03:43:49	1.127
@@ -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.124 2007/08/29 00:50:50 albertel Exp $
+# $Id: lonuserstate.pm,v 1.127 2007/12/01 03:43:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -210,7 +210,7 @@ sub loadmap {
 	$hash{'type_'.$from_rid}='finish';
     }
 
-    my $parser = HTML::TokeParser->new(\$instr);
+    $parser = HTML::TokeParser->new(\$instr);
     $parser->attr_encoded(1);
     # last parse out the mapalias params so as to ignore anything
     # refering to non-existant resources
@@ -471,7 +471,8 @@ sub traceroute {
 	    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});
 	    }
@@ -837,8 +838,8 @@ sub evalstate {
 			     $count++;
 			 }
 			 my ($mapid) = split(/\./,$id);
-                         &mt('[_1] in [_2]', $hash{'title_'.$id},
-
+                         &mt('Resource "[_1]" <br /> in Map "[_2]"',
+			     $hash{'title_'.$id},
 			     $hash{'title_'.$hash{'ids_'.$hash{'map_id_'.$mapid}}});
 		     } (@{ $mapalias_cache{$mapalias} }));
 	    next if ($count < 2);