Diff for /rat/lonuserstate.pm between versions 1.143 and 1.145

version 1.143, 2012/07/21 21:08:56 version 1.145, 2013/05/06 18:08:39
Line 1108  sub readmap { Line 1108  sub readmap {
  #    # 
  # Most likely a permissions problem on the lockfile or its directory.   # 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 = '';          $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 $lock=0;
     my $gotstate=0;      my $gotstate=0;
Line 1126  sub readmap { Line 1125  sub readmap {
     undef %hiddenurl;      undef %hiddenurl;
     undef %encurl;      undef %encurl;
     $retfrid='';      $retfrid='';
       $errtext='';
     my ($untiedhash,$untiedparmhash,$tiedhash,$tiedparmhash); # More state flags.      my ($untiedhash,$untiedparmhash,$tiedhash,$tiedparmhash); # More state flags.
   
     # if we got the lock, regenerate course regnerate empty files and tie them.      # if we got the lock, regenerate course regnerate empty files and tie them.
Line 1267  sub readmap { Line 1267  sub readmap {
         undef %randompick;          undef %randompick;
         undef %hiddenurl;          undef %hiddenurl;
         undef %encurl;          undef %encurl;
           $errtext='';
         $retfrid='';          $retfrid='';
  #   #
  # Once more through the routine of tying and loading and so on.   # Once more through the routine of tying and loading and so on.
Line 1430  sub unlink_tmpfiles { Line 1431  sub unlink_tmpfiles {
     my ($fn) = @_;      my ($fn) = @_;
     my $file_dir = dirname($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);          my @files = qw (.db _symb.db .state _parms.db);
         foreach my $file (@files) {          foreach my $file (@files) {
             if (-e $fn.$file) {              if (-e $fn.$file) {

Removed from v.1.143  
changed lines
  Added in v.1.145


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>