--- rat/lonuserstate.pm	2006/06/30 04:23:25	1.117
+++ rat/lonuserstate.pm	2007/10/29 18:51:00	1.119.2.1
@@ -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.117 2006/06/30 04:23:25 raeburn Exp $
+# $Id: lonuserstate.pm,v 1.119.2.1 2007/10/29 18:51:00 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -199,7 +199,7 @@ sub loadmap {
                         $hash{'ids_'.$idsuri}=''.$rid;
                     }
                
-                    if ($turi=~/\/(syllabus|aboutme|navmaps|smppg|grppg|bulletinboard)$/) {
+                    if ($turi=~/\/(syllabus|aboutme|navmaps|smppg|bulletinboard)$/) {
 			$turi.='?register=1';
 		    }
 
@@ -234,7 +234,9 @@ sub loadmap {
                     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'};
@@ -298,7 +300,7 @@ sub loadmap {
 			$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) {