--- rat/lonuserstate.pm	2007/10/29 18:51:00	1.119.2.1
+++ rat/lonuserstate.pm	2007/08/28 01:06:15	1.120
@@ -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.119.2.1 2007/10/29 18:51:00 albertel Exp $
+# $Id: lonuserstate.pm,v 1.120 2007/08/28 01:06:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -108,7 +108,9 @@ sub processversionfile {
 sub loadmap { 
     my $uri=shift;
     if ($hash{'map_pc_'.$uri}) { 
-	$errtext.=&mt('<br />Multiple use of sequence/page <tt>[_1]</tt>! The course will not function properly.',$uri);
+	$errtext.='<p class="LC_error">'.
+	    &mt('Multiple use of sequence/page [_1]! The course will not function properly.','<tt>'.$uri.'</tt>').
+	    '</p>';
 	return; 
     }
     $pc++;
@@ -234,9 +236,7 @@ sub loadmap {
                     my $rid=$lpc.'.'.$token->[2]->{'id'};
 
                     $hash{'kind_'.$rid}='cond';
-		    my $condition = $token->[2]->{'value'};
-		    $condition =~ s/[\n\r]+/ /gs; 
-                    push(@cond, $condition);
+                    $cond[$#cond+1]=$token->[2]->{'value'};
                     $hash{'condid_'.$rid}=$#cond;
                     if ($token->[2]->{'type'}) {
                         $cond[$#cond].=':'.$token->[2]->{'type'};
@@ -350,7 +350,7 @@ sub simplify {
 sub traceroute {
     my ($sofar,$rid,$beenhere,$encflag,$hdnflag)=@_;
     my $newsofar=$sofar=simplify($sofar);
-    unless ($beenhere=~/\&$rid\&/) {
+    unless ($beenhere=~/\&\Q$rid\E\&/) {
 	$beenhere.=$rid.'&';  
 	my ($mapid,$resid)=split(/\./,$rid);
 	my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$rid});