version 1.320, 2008/12/13 00:19:07
|
version 1.321, 2008/12/15 03:02:19
|
Line 1270 ENDPASTE
|
Line 1270 ENDPASTE
|
sub do_paste_from_buffer { |
sub do_paste_from_buffer { |
my ($coursenum,$coursedom,$folder) = @_; |
my ($coursenum,$coursedom,$folder) = @_; |
|
|
return 0 if (!$env{'form.pastemarked'}); |
if (!$env{'form.pastemarked'}) { |
|
return; |
|
} |
|
|
# paste resource to end of list |
# paste resource to end of list |
my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'}); |
my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'}); |
Line 1283 sub do_paste_from_buffer {
|
Line 1285 sub do_paste_from_buffer {
|
my $newurl=$1.$newid.'.'.$2; |
my $newurl=$1.$newid.'.'.$2; |
my $storefn=$newurl; |
my $storefn=$newurl; |
$storefn=~s{^/\w+/$match_domain/$match_username/}{}; |
$storefn=~s{^/\w+/$match_domain/$match_username/}{}; |
&Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn, |
my $paste_map_result = |
&Apache::lonnet::getfile($url)); |
&Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn, |
|
&Apache::lonnet::getfile($url)); |
|
if ($paste_map_result eq '/adm/notfound.html') { |
|
if ($url=~/\.page$/) { |
|
return &mt('Paste failed: an error occurred saving the composite page'); |
|
} else { |
|
return &mt('Paste failed: an error occurred saving the folder'); |
|
} |
|
} |
$url = $newurl; |
$url = $newurl; |
} |
} |
# published maps can only exists once, so remove it from paste buffer when done |
# published maps can only exists once, so remove it from paste buffer when done |
Line 1326 sub do_paste_from_buffer {
|
Line 1336 sub do_paste_from_buffer {
|
|
|
$LONCAPA::map::resources[$newidx]= $title.':'.$url.':'.$ext.':normal:res'; |
$LONCAPA::map::resources[$newidx]= $title.':'.$url.':'.$ext.':normal:res'; |
push(@LONCAPA::map::order, $newidx); |
push(@LONCAPA::map::order, $newidx); |
|
return 'ok'; |
# Store the result |
# Store the result |
} |
} |
|
|
Line 1444 sub editor {
|
Line 1455 sub editor {
|
} |
} |
|
|
if ($env{'form.pastemarked'}) { |
if ($env{'form.pastemarked'}) { |
&do_paste_from_buffer($coursenum,$coursedom,$folder); |
my $paste_res = |
($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container); |
&do_paste_from_buffer($coursenum,$coursedom,$folder); |
return $errtext if ($fatal); |
if ($paste_res eq 'ok') { |
|
($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container); |
|
return $errtext if ($fatal); |
|
} elsif ($paste_res ne '') { |
|
$r->print('<p><span class="LC_error">'.$paste_res.'</span></p>'); |
|
} |
} |
} |
|
|
$r->print($upload_output); |
$r->print($upload_output); |