--- rat/lonuserstate.pm	2012/07/21 21:08:56	1.143
+++ rat/lonuserstate.pm	2013/05/06 18:08:39	1.145
@@ -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.143 2012/07/21 21:08:56 raeburn Exp $
+# $Id: lonuserstate.pm,v 1.145 2013/05/06 18:08:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1108,9 +1108,8 @@ sub readmap {
 	# 
 	# Most likely a permissions problem on the lockfile or its directory.
 	#
-        $errtext.='<br />'.&mt('Map not loaded - Lock file could not be opened when reading map:').' <tt>'.$fn.'</tt>.';
         $retfurl = '';
-        return ($retfurl,$errtext);
+        return ($retfurl,'<br />'.&mt('Map not loaded - Lock file could not be opened when reading map:').' <tt>'.$fn.'</tt>.');
     }
     my $lock=0;
     my $gotstate=0;
@@ -1126,6 +1125,7 @@ sub readmap {
     undef %hiddenurl;
     undef %encurl;
     $retfrid='';
+    $errtext='';
     my ($untiedhash,$untiedparmhash,$tiedhash,$tiedparmhash); # More state flags.
 
     # if we got the lock, regenerate course regnerate empty files and tie them.
@@ -1267,6 +1267,7 @@ sub readmap {
         undef %randompick;
         undef %hiddenurl;
         undef %encurl;
+        $errtext='';
         $retfrid='';
 	#
 	# Once more through the routine of tying and loading and so on.
@@ -1430,7 +1431,7 @@ sub unlink_tmpfiles {
     my ($fn) = @_;
     my $file_dir = dirname($fn);
 
-    if ($fn eq LONCAPA::tempdir()) {
+    if ("$file_dir/" eq LONCAPA::tempdir()) {
         my @files = qw (.db _symb.db .state _parms.db);
         foreach my $file (@files) {
             if (-e $fn.$file) {