--- rat/lonuserstate.pm	2005/11/09 11:39:57	1.97
+++ rat/lonuserstate.pm	2006/02/23 08:38:54	1.99.2.1
@@ -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.97 2005/11/09 11:39:57 www Exp $
+# $Id: lonuserstate.pm,v 1.99.2.1 2006/02/23 08:38:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,7 +31,6 @@ package Apache::lonuserstate;
 
 # ------------------------------------------------- modules used by this module
 use strict;
-use Apache::Constants qw(:common :http);
 use HTML::TokeParser;
 use Apache::lonnet;
 use Apache::loncommon();
@@ -104,7 +103,7 @@ sub processversionfile {
 
 sub loadmap { 
     my $uri=shift;
-    if ($hash{'map_pc_'.$uri}) { return OK; }
+    if ($hash{'map_pc_'.$uri}) { return; }
 
     $pc++;
     my $lpc=$pc;
@@ -119,7 +118,7 @@ sub loadmap {
     unless (($fn=~/\.sequence$/) ||
             ($fn=~/\.page$/)) { 
 	$errtext.="Invalid map: $fn\n";
-	return OK; 
+	return; 
     }
 
     my $instr=&Apache::lonnet::getfile($fn);
@@ -167,8 +166,7 @@ sub loadmap {
                         } elsif ($turi=~/^\/*uploaded\//) { # uploaded
 			    if (($embstyle eq 'img') 
 				|| ($embstyle eq 'emb')
-				|| ($embstyle eq 'ign')
-				|| ($embstyle eq 'unk')) {
+				|| ($embstyle eq 'wrp')) {
                                 $turi='/adm/wrapper'.$turi;
 			    } elsif ($embstyle eq 'ssi') {
 				#do nothing with these
@@ -179,7 +177,9 @@ sub loadmap {
 			    my $mapdir=$uri;
 			    $mapdir=~s/[^\/]+$//;
 			    $turi=&Apache::lonnet::hreflocation($mapdir,$turi);
-			    if (($embstyle eq 'img') || ($embstyle eq 'emb')) {
+			    if (($embstyle eq 'img') 
+				|| ($embstyle eq 'emb')
+				|| ($embstyle eq 'wrp')) {
 				$turi='/adm/wrapper'.$turi;
 			    }
                         }
@@ -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;