--- rat/lonuserstate.pm	2006/05/05 15:50:20	1.109
+++ rat/lonuserstate.pm	2006/05/25 21:09:45	1.113
@@ -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.109 2006/05/05 15:50:20 albertel Exp $
+# $Id: lonuserstate.pm,v 1.113 2006/05/25 21:09:45 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -592,8 +592,12 @@ sub readmap {
 	}
 # ------------------------------------------------------- Put versions into src
 	foreach my $key (keys(%hash)) {
-	    if ($key=~/^src\_/) {
+	    if ($key=~/^src_/) {
 		$hash{$key}=&putinversion($hash{$key});
+	    } elsif ($key =~ /^(map_(?:start|finish|pc)_)(.*)/) {
+		my ($type, $url) = ($1,$2);
+		my $value = $hash{$key};
+		$hash{$type.&putinversion($url)}=$value;
 	    }
 	}
 # ---------------------------------------------------------------- Encrypt URLs
@@ -677,7 +681,7 @@ sub evalstate {
     if (-e $fn) {
 	my @conditions=();
 	{
-	    my $fh=Apache::File->new($fn);
+	    open(my $fh,$fn);
 	    @conditions=<$fh>;
 	}  
 	my $safeeval = new Safe;