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

[albertel]

albertel		Mon Aug 27 21:06:17 2007 EDT

  Modified files:              
    /rat	lonuserstate.pm 
  Log:
  - xhtml
  - protect the rig in the regexp
  
  
Index: rat/lonuserstate.pm
diff -u rat/lonuserstate.pm:1.119 rat/lonuserstate.pm:1.120
--- rat/lonuserstate.pm:1.119	Thu Jun 28 18:16:53 2007
+++ rat/lonuserstate.pm	Mon Aug 27 21:06:15 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.119 2007/06/28 22:16:53 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 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++;
@@ -348,7 +350,7 @@
 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});