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

[albertel]

albertel		Wed Feb 22 18:44:55 2006 EDT

  Modified files:              
    /rat	lonuserstate.pm 
  Log:
  - reverting expirement for now
  
  
Index: rat/lonuserstate.pm
diff -u rat/lonuserstate.pm:1.102 rat/lonuserstate.pm:1.103
--- rat/lonuserstate.pm:1.102	Wed Feb 22 17:36:34 2006
+++ rat/lonuserstate.pm	Wed Feb 22 18:44:55 2006
@@ -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.102 2006/02/22 22:36:34 albertel Exp $
+# $Id: lonuserstate.pm,v 1.103 2006/02/22 23:44:55 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -364,11 +364,11 @@
 	}
 	if (defined($hash{'conditions_'.$rid})) {
 	    $hash{'conditions_'.$rid}=simplify(
-           '('.'conditions_'.$rid.')|('.$sofar.')');
+           '('.$hash{'conditions_'.$rid}.')|('.$sofar.')');
 	} else {
 	    $hash{'conditions_'.$rid}=$sofar;
 	}
-	$newsofar='conditions_'.$rid;
+	$newsofar=$hash{'conditions_'.$rid};
 	if (defined($hash{'is_map_'.$rid})) {
 	    if (defined($hash{'map_start_'.$hash{'src_'.$rid}})) {
 		$sofar=$newsofar=