--- rat/lonuserstate.pm	2006/02/23 08:38:54	1.99.2.1
+++ rat/lonuserstate.pm	2006/02/22 22:36:34	1.102
@@ -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.2.1 2006/02/23 08:38:54 albertel Exp $
+# $Id: lonuserstate.pm,v 1.102 2006/02/22 22:36:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -364,11 +364,11 @@ sub traceroute {
 	}
 	if (defined($hash{'conditions_'.$rid})) {
 	    $hash{'conditions_'.$rid}=simplify(
-           '('.$hash{'conditions_'.$rid}.')|('.$sofar.')');
+           '('.'conditions_'.$rid.')|('.$sofar.')');
 	} else {
 	    $hash{'conditions_'.$rid}=$sofar;
 	}
-	$newsofar=$hash{'conditions_'.$rid};
+	$newsofar='conditions_'.$rid;
 	if (defined($hash{'is_map_'.$rid})) {
 	    if (defined($hash{'map_start_'.$hash{'src_'.$rid}})) {
 		$sofar=$newsofar=
@@ -445,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})) {