--- rat/lonuserstate.pm	2007/06/28 23:26:38	1.118.2.2
+++ rat/lonuserstate.pm	2007/11/30 19:14:14	1.126
@@ -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.118.2.2 2007/06/28 23:26:38 albertel Exp $
+# $Id: lonuserstate.pm,v 1.126 2007/11/30 19:14:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -109,7 +109,9 @@ sub processversionfile {
 sub loadmap { 
     my ($uri,$parent_rid)=@_;
     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++;
@@ -174,13 +176,23 @@ sub loadmap {
     }
 
     if ($randomize) {
-	my $seed = (split(/\./,$parent_rid))[1];
-	if ($randompickseed{$parent_rid}) {
-	    $seed = $randompickseed{$parent_rid};
+	if (!$env{'request.role.adv'}) {
+	    my $seed;
+	    if (defined($randompickseed{$parent_rid})) {
+		$seed = $randompickseed{$parent_rid};
+	    } else {
+		my ($mapid,$resid)=split(/\./,$parent_rid);
+		my $symb=
+		    &Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},
+						 $resid,$hash{'src_'.$parent_rid});
+		
+		$seed = $symb;
+	    }
+	
+	    my $rndseed=&Apache::lonnet::rndseed($seed);
+	    &Apache::lonnet::setup_random_from_rndseed($rndseed);
+	    @map_ids=&Math::Random::random_permutation(@map_ids);
 	}
-	my $rndseed=&Apache::lonnet::rndseed($seed);
-	&Apache::lonnet::setup_random_from_rndseed($rndseed);
-	my @map_ids=&Math::Random::random_permutation(@map_ids);
 	my $from = shift(@map_ids);
 	my $from_rid = $lpc.'.'.$from;
 	$hash{'map_start_'.$uri} = $from_rid;
@@ -197,6 +209,17 @@ sub loadmap {
 	$hash{'map_finish_'.$uri}= $from_rid;
 	$hash{'type_'.$from_rid}='finish';
     }
+
+    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);
+	} 
+    }
 }
 
 
@@ -320,7 +343,10 @@ sub parse_condition {
     my $rid=$lpc.'.'.$token->[2]->{'id'};
     
     $hash{'kind_'.$rid}='cond';
-    $cond[$#cond+1]=$token->[2]->{'value'};
+
+    my $condition = $token->[2]->{'value'};
+    $condition =~ s/[\n\r]+/ /gs;
+    push(@cond, $condition);
     $hash{'condid_'.$rid}=$#cond;
     if ($token->[2]->{'type'}) {
 	$cond[$#cond].=':'.$token->[2]->{'type'};
@@ -351,9 +377,6 @@ sub parse_param {
     } 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'};
     }
@@ -362,7 +385,6 @@ sub parse_param {
     }
     if ($token->[2]->{'name'}=~/^parameter_(0_)*randomorder$/) {
 	$randomorder{$referid}=$token->[2]->{'value'};
-	&Apache::lonnet::logthis("roing $referid ".$randomorder{$referid});
     }
     if ($token->[2]->{'name'}=~/^parameter_(0_)*encrypturl$/) {
 	if ($token->[2]->{'value'}=~/^yes$/i) {
@@ -376,6 +398,17 @@ sub parse_param {
     }
 }
 
+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$/) {
+	&count_mapalias($token->[2]->{'value'},$referid);
+	$hash{'mapalias_'.$token->[2]->{'value'}}=$referid;
+    }
+}
+
 # --------------------------------------------------------- Simplify expression
 
 sub simplify {
@@ -404,7 +437,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});
@@ -438,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});
 	    }
@@ -635,6 +669,7 @@ sub readmap {
 	%parmhash=();
 	$errtext='';
 	$pc=0;
+	&clear_mapalias_count();
 	&processversionfile(%cenv);
 	my $furi=&Apache::lonnet::clutter($uri);
 	$hash{'src_0.0'}=&versiontrack($furi);
@@ -651,6 +686,7 @@ sub readmap {
 	    &accinit($uri,$short,$fn);
 	    &hiddenurls();
 	}
+	$errtext .= &get_mapalias_errors();
 # ------------------------------------------------------- Put versions into src
 	foreach my $key (keys(%hash)) {
 	    if ($key=~/^src_/) {
@@ -782,6 +818,43 @@ sub evalstate {
     return $state;
 }
 
+{
+    my %mapalias_cache;
+    sub count_mapalias {
+	my ($value,$resid) = @_;
+ 	push(@{ $mapalias_cache{$value} }, $resid);
+    }
+
+    sub get_mapalias_errors {
+	my $error_text;
+	foreach my $mapalias (sort(keys(%mapalias_cache))) {
+	    next if (scalar(@{ $mapalias_cache{$mapalias} } ) == 1);
+	    my $count;
+	    my $which =
+		join('</li><li>', 
+		     map {
+			 my $id = $_;
+			 if (exists($hash{'src_'.$id})) {
+			     $count++;
+			 }
+			 my ($mapid) = split(/\./,$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);
+	    $error_text .= '<div class="LC_error">'.
+		&mt('Error: Found the mapalias "[_1]" defined multiple times.',
+		    $mapalias).
+		'</div><ul><li>'.$which.'</li></ul>';
+	}
+	&clear_mapalias_count();
+	return $error_text;
+    }
+    sub clear_mapalias_count {
+	undef(%mapalias_cache);
+    }
+}
 1;
 __END__