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

[albertel]

albertel		Tue Aug 28 12:45:21 2007 EDT

  Modified files:              
    /rat	lonuserstate.pm 
  Log:
  - conditions get stored intoa file delimited by newlines, thus need to ensure the conditions are newline free
  
  
Index: rat/lonuserstate.pm
diff -u rat/lonuserstate.pm:1.122 rat/lonuserstate.pm:1.123
--- rat/lonuserstate.pm:1.122	Mon Aug 27 21:13:19 2007
+++ rat/lonuserstate.pm	Tue Aug 28 12:45:20 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.122 2007/08/28 01:13:19 albertel Exp $
+# $Id: lonuserstate.pm,v 1.123 2007/08/28 16:45:20 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -236,7 +236,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'};