--- rat/lonuserstate.pm	2006/01/10 21:41:29	1.99
+++ rat/lonuserstate.pm	2006/02/22 21:58:59	1.101
@@ -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.99 2006/01/10 21:41:29 albertel Exp $
+# $Id: lonuserstate.pm,v 1.101 2006/02/22 21:58:59 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -318,6 +318,8 @@ sub loadmap {
 
 sub simplify {
     my $expression=shift;
+# (0&1) = 1
+    $expression=~s/\(0\&(\d+)\)/$1/g;
 # (8)=8
     $expression=~s/\((\d+)\)/$1/g;
 # 8&8=8
@@ -327,8 +329,8 @@ sub simplify {
 # (5&3)&4=5&3&4
     $expression=~s/\((\d+)((?:\&\d+)+)\)\&(\d+\D)/$1$2\&$3/g;
 # (((5&3)|(4&6)))=((5&3)|(4&6))
-    $expression=~
-	s/\((\(\(\d+(?:\&\d+)*\)(?:\|\(\d+(?:\&\d+)*\))+\))\)/$1/g;
+#    $expression=~
+#	s/\((\(\(\d+(?:\&\d+)*\)(?:\|\(\d+(?:\&\d+)*\))+\))\)/$1/g;
 # ((5&3)|(4&6))|(1&2)=(5&3)|(4&6)|(1&2)
     $expression=~
 	s/\((\(\d+(?:\&\d+)*\))((?:\|\(\d+(?:\&\d+)*\))+)\)\|(\(\d+(?:\&\d+)*\))/\($1$2\|$3\)/g;
@@ -443,12 +445,8 @@ sub accinit {
 	    foreach (split(/\,/,$hash{$_})) {
 		my $resid=$_;
 		my $uri=$hash{'src_'.$resid};
-		$uri=~s/^\/adm\/wrapper//;
-		$uri=&Apache::lonnet::declutter($uri);
-		my @uriparts=split(/\//,$uri);
-		my $urifile=$uriparts[$#uriparts];
-		$#uriparts--;
-		my $uripath=join('/',@uriparts);
+		my ($uripath,$urifile) =
+		    &Apache::lonnet::split_uri_for_cond($uri);
 		if ($uripath) {
 		    my $uricond='0';
 		    if (defined($hash{'conditions_'.$resid})) {