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

[albertel]

albertel		Mon Oct 29 14:51:04 2007 EDT

  Modified files:              (Branch: version_2_5_X)
    /rat	lonuserstate.pm 
  Log:
  - backport 1.123
  
  
Index: rat/lonuserstate.pm
diff -u rat/lonuserstate.pm:1.119 rat/lonuserstate.pm:1.119.2.1
--- rat/lonuserstate.pm:1.119	Thu Jun 28 18:16:53 2007
+++ rat/lonuserstate.pm	Mon Oct 29 14:51:00 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.119.2.1 2007/10/29 18:51:00 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -234,7 +234,9 @@
                     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'};