[LON-CAPA-cvs] cvs: rat / lonuserstate.pm

[raeburn]

raeburn		Sun Nov 11 22:26:49 2012 EDT

  Modified files:              
    /rat	lonuserstate.pm 
  Log:
  - Bug 6619.
  - Initialize global $errtext when lonuserstate::readmap() is called, to
    exclude errors accumulated in prior calls of lonuserstate::loadmap().    
  
  
Index: rat/lonuserstate.pm
diff -u rat/lonuserstate.pm:1.143 rat/lonuserstate.pm:1.144
--- rat/lonuserstate.pm:1.143	Sat Jul 21 21:08:56 2012
+++ rat/lonuserstate.pm	Sun Nov 11 22:26:49 2012
@@ -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.144 2012/11/11 22:26:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1108,9 +1108,8 @@
 	# 
 	# 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 @@
     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 @@
         undef %randompick;
         undef %hiddenurl;
         undef %encurl;
+        $errtext='';
         $retfrid='';
 	#
 	# Once more through the routine of tying and loading and so on.