--- rat/lonuserstate.pm	2006/05/30 19:47:40	1.116
+++ rat/lonuserstate.pm	2007/08/28 01:09:14	1.121
@@ -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.116 2006/05/30 19:47:40 www Exp $
+# $Id: lonuserstate.pm,v 1.121 2007/08/28 01:09:14 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++;
@@ -291,14 +293,11 @@ sub loadmap {
                     } else {
                         $hash{'param_'.$referid}=''.$newparam;
                     }
-                    if ($token->[2]->{'name'}=~/^parameter_(0_)*mapalias$/) {
-			$hash{'mapalias_'.$token->[2]->{'value'}}=$referid;
-                    }
                     if ($token->[2]->{'name'}=~/^parameter_(0_)*randompick$/) {
 			$randompick{$referid}=$token->[2]->{'value'};
                     }
                     if ($token->[2]->{'name'}=~/^parameter_(0_)*randompickseed$/) {
-			$randompick{$referid}=$token->[2]->{'value'};
+			$randompickseed{$referid}=$token->[2]->{'value'};
                     }
                     if ($token->[2]->{'name'}=~/^parameter_(0_)*encrypturl$/) {
 			if ($token->[2]->{'value'}=~/^yes$/i) {
@@ -318,6 +317,27 @@ sub loadmap {
     } else {
         $errtext.=&mt('<br />Map not loaded: The file <tt>[_1]</tt> does not exist.',$fn);
     }
+
+    my $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
+    while (my $token = $parser->get_token) {
+	next if ($token->[0] ne 'S');
+	if ($token->[1] eq 'param') {
+	    &parse_mapalias_param($token,$lpc);
+	} 
+    }
+}
+
+sub parse_mapalias_param {
+    my ($token,$lpc) = @_;
+    my $referid=$lpc.'.'.$token->[2]->{'to'};
+    return if (!exists($hash{'src_'.$referid}));
+
+    if ($token->[2]->{'name'}=~/^parameter_(0_)*mapalias$/) {
+	$hash{'mapalias_'.$token->[2]->{'value'}}=$referid;
+    }
 }
 
 # --------------------------------------------------------- Simplify expression
@@ -348,7 +368,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});