version 1.10, 2007/12/01 03:07:39
|
version 1.12, 2008/12/19 03:49:56
|
Line 265 sub pastetarget {
|
Line 265 sub pastetarget {
|
my $idx=&getresidx($url,$residx); |
my $idx=&getresidx($url,$residx); |
$insertorder[$#insertorder+1]=$idx; |
$insertorder[$#insertorder+1]=$idx; |
my $ext='false'; |
my $ext='false'; |
if ($url=~/^http\:\/\//) { $ext='true'; } |
if ($url=~/^https?\:\/\//) { $ext='true'; } |
$url=~s/\:/\:/g; |
$url=~s/\:/\:/g; |
$name=~s/\:/\:/g; |
$name=~s/\:/\:/g; |
$resources[$idx]=$name.':'.$url.':'.$ext.':normal:res'; |
$resources[$idx]=$name.':'.$url.':'.$ext.':normal:res'; |
Line 283 sub startfinish {
|
Line 283 sub startfinish {
|
# Remove all start and finish |
# Remove all start and finish |
foreach (@order) { |
foreach (@order) { |
my ($name,$url,$ext)=split(/\:/,$resources[$_]); |
my ($name,$url,$ext)=split(/\:/,$resources[$_]); |
if ($url=~/http\&colon\:\/\//) { $ext='true'; } |
if ($url=~/https?\&colon\:\/\//) { $ext='true'; } |
$resources[$_]=$name.':'.$url.':'.$ext.':normal:res'; |
$resources[$_]=$name.':'.$url.':'.$ext.':normal:res'; |
} |
} |
# Garbage collection |
# Garbage collection |
Line 357 sub storemap {
|
Line 357 sub storemap {
|
$output.='<&>objcont<:>'.$i.'<:>'.$zombies[$i]; |
$output.='<&>objcont<:>'.$i.'<:>'.$zombies[$i]; |
} |
} |
} |
} |
$output=~s/http\&colon\;\/\///g; |
$output=~s/https?\&colon\;\/\///g; |
$env{'form.output'}=$output; |
$env{'form.output'}=$output; |
return &loadmap($fn,&savemap($fn,'')); |
return &loadmap($fn,&savemap($fn,'')); |
} |
} |
Line 456 sub loadmap {
|
Line 456 sub loadmap {
|
$instr=join('',@content); |
$instr=join('',@content); |
} |
} |
if ($instr eq -2) { |
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') { |
} elsif ($instr eq '-1') { |
# Map doesn't exist |
# Map doesn't exist |
} elsif ($instr) { |
} elsif ($instr) { |
Line 616 sub savemap {
|
Line 616 sub savemap {
|
} |
} |
$comp[1].='" external="true'; |
$comp[1].='" external="true'; |
} else { |
} else { |
if ($comp[1]=~/^http\:\/\//) { |
if ($comp[1]=~/^https?\:\/\//) { |
$comp[1]=~s/^http\:\/\/[^\/]*\//\//; |
$comp[1]=~s/^https?\:\/\/[^\/]*\//\//; |
} |
} |
} |
} |
$outstr.='<resource id="'.$parts[1].'" src="' |
$outstr.='<resource id="'.$parts[1].'" src="' |
Line 679 sub savemap {
|
Line 679 sub savemap {
|
my $result=&Apache::lonnet::finishuserfileupload($2,$1, |
my $result=&Apache::lonnet::finishuserfileupload($2,$1, |
'output',$3); |
'output',$3); |
if ($result != m|^/uploaded/|) { |
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 { |
} else { |
if (open(my $fh,">$fn")) { |
if (open(my $fh,">$fn")) { |