--- rat/map.pm 2008/12/19 03:49:56 1.12 +++ 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.12 2008/12/19 03:49:56 raeburn Exp $ +# $Id: map.pm,v 1.14 2012/07/21 21:20:19 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -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); @@ -357,9 +357,9 @@ sub storemap { $output.='<&>objcont<:>'.$i.'<:>'.$zombies[$i]; } } - $output=~s/https?\&colon\;\/\///g; + $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 @@ -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; @@ -616,8 +616,8 @@ sub savemap { } $comp[1].='" external="true'; } else { - if ($comp[1]=~/^https?\:\/\//) { - $comp[1]=~s/^https?\:\/\/[^\/]*\//\//; + if ($comp[1]=~/^http\:\/\//) { + $comp[1]=~s/^http\:\/\/[^\/]*\//\//; } } $outstr.='