--- rat/map.pm 2007/12/01 03:07:39 1.10 +++ rat/map.pm 2012/07/21 21:20:19 1.14 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # routines for modyfing .sequence and .page files # -# $Id: map.pm,v 1.10 2007/12/01 03:07:39 albertel Exp $ +# $Id: map.pm,v 1.14 2012/07/21 21:20:19 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -265,7 +265,7 @@ sub pastetarget { my $idx=&getresidx($url,$residx); $insertorder[$#insertorder+1]=$idx; my $ext='false'; - if ($url=~/^http\:\/\//) { $ext='true'; } + if ($url=~/^https?\:\/\//) { $ext='true'; } $url=~s/\:/\:/g; $name=~s/\:/\:/g; $resources[$idx]=$name.':'.$url.':'.$ext.':normal:res'; @@ -283,7 +283,7 @@ sub startfinish { # Remove all start and finish foreach (@order) { my ($name,$url,$ext)=split(/\:/,$resources[$_]); - if ($url=~/http\&colon\:\/\//) { $ext='true'; } + if ($url=~/https?\&colon\:\/\//) { $ext='true'; } $resources[$_]=$name.':'.$url.':'.$ext.':normal:res'; } # Garbage collection @@ -319,11 +319,11 @@ sub startfinish { # ------------------------------------------------------------------- Store map sub storemap { - my $realfn=shift; + my ($realfn,$useorig,$dotimeupdate) = @_; my $fn=$realfn; # unless this is forced to work from the original file, use a temporary file # instead - unless (shift) { + unless ($useorig) { $fn=$realfn.'.tmp'; unless (-e $fn) { copy($realfn,$fn); @@ -359,7 +359,7 @@ sub storemap { } $output=~s/http\&colon\;\/\///g; $env{'form.output'}=$output; - return &loadmap($fn,&savemap($fn,'')); + return &loadmap($fn,&savemap($fn,'',$dotimeupdate)); } # ------------------------------------------ Store and get parameters in global @@ -456,7 +456,7 @@ sub loadmap { $instr=join('',@content); } if ($instr eq -2) { - $errtext.='Map not loaded: An error occured while trying to load the map.'; + $errtext.='Map not loaded: An error occurred while trying to load the map.'; } elsif ($instr eq '-1') { # Map doesn't exist } elsif ($instr) { @@ -583,7 +583,7 @@ sub loadmap { # ----------------------------------------------------------- Saves map to disk sub savemap { - my ($fn,$errtext)=@_; + my ($fn,$errtext,$dotimeupdate)=@_; my $infotext=''; my %alltypes; my %allvalues; @@ -679,7 +679,7 @@ sub savemap { my $result=&Apache::lonnet::finishuserfileupload($2,$1, 'output',$3); if ($result != m|^/uploaded/|) { - $errtext.='Map not saved: A network error occured when trying to save the map. '; + $errtext.='Map not saved: A network error occurred when trying to save the map. '; } } else { if (open(my $fh,">$fn")) { @@ -689,6 +689,19 @@ sub savemap { $errtext.='Could not write file '.$fn.'. Map not saved. '; } } + if ($dotimeupdate) { + unless ($errtext) { + if ($env{'request.course.id'}) { + my $now = time; + &Apache::lonnet::put('environment',{'internal.contentchange' => $now}, + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}); + &Apache::lonnet::appenv( + {'course.'.$env{'request.course.id'}.'.internal.contentchange' => $now}); + &Apache::lonnet::do_cache_new('crschange',$env{'request.course.id'},$now,600); + } + } + } } else { # -------------------------------------------- Cannot write to that file, error $errtext.='Map not saved: The specified path does not exist. '; 500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.