--- rat/lonuserstate.pm	2011/08/09 09:15:50	1.140
+++ rat/lonuserstate.pm	2011/10/20 17:14:19	1.142
@@ -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.140 2011/08/09 09:15:50 foxr Exp $
+# $Id: lonuserstate.pm,v 1.142 2011/10/20 17:14:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -297,7 +297,7 @@ sub loadmap {
 	    # processing the randomorder parameter if it is set, not
 	    # randompick.
 
-	    @map_ids=&math::Random::random_permutation(@map_ids); 
+	    @map_ids=&Math::Random::random_permutation(@map_ids); 
 	}
 
 
@@ -801,7 +801,7 @@ sub simplify {
 # 8&8=8
     $expression=~s/([^_\.\d])([_\.\d]+)\&\2([^_\.\d])/$1$2$3/g;
 # 8|8=8
-    $expression=~s/([^_\.\d])([_\.\d]+)\|\2([^_\.\d])/$1$2$3/g;
+    $expression=~s/([^_\.\d])([_\.\d]+)(?:\|\2)+([^_\.\d])/$1$2$3/g;
 # (5&3)&4=5&3&4
     $expression=~s/\(([_\.\d]+)((?:\&[_\.\d]+)+)\)\&([_\.\d]+[^_\.\d])/$1$2\&$3/g;
 # (((5&3)|(4&6)))=((5&3)|(4&6))