--- loncom/interface/londocs.pm 2013/08/08 02:18:50 1.484.2.37 +++ loncom/interface/londocs.pm 2013/09/22 02:24:27 1.484.2.41 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.484.2.37 2013/08/08 02:18:50 raeburn Exp $ +# $Id: londocs.pm,v 1.484.2.41 2013/09/22 02:24:27 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -410,6 +410,8 @@ END unless ($fatal) { if ($folder =~ /^supplemental/) { &Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1); + my ($errtext,$fatal) = &mapread($coursenum,$coursedom, + $folder.'.'.$container); } } return ($errtext,$fatal,$fixuperrors); @@ -710,7 +712,7 @@ sub update_paste_buffer { my $url = $env{'docs.markedcopy_url_'.$suffix}; if (($cid =~ /^$match_domain(?:_)$match_courseid$/) && ($url ne '')) { - $pasteurls{$cid.'_'.$url}; + $pasteurls{$cid.'_'.$url} = 1; } } } @@ -1107,8 +1109,7 @@ sub do_paste_from_buffer { } my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%duplicate, - %prefixchg,%srcdom,%srcnum,%marktomove,$save_err,$lockerrors,$allresult, - %msgs); + %prefixchg,%srcdom,%srcnum,%marktomove,$save_err,$lockerrors,$allresult); foreach my $suffix (@topaste) { my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix}); @@ -1559,7 +1560,7 @@ sub get_newmap_url { sub dbcopy { my ($dbref,$coursedom,$coursenum,$lockerrorsref) = @_; my ($url,$result,$errtext); - my $url = $dbref->{'src'}; + $url = $dbref->{'src'}; if (ref($dbref) eq 'HASH') { if ($url =~ m{/(smppg|bulletinboard)$}) { my $prefix = $1; @@ -1625,11 +1626,13 @@ sub dbcopy { &mt('There was a problem removing a lockfile.'); if ($prefix eq 'smppg') { $lockerrorsref->{$prefix} .= - &mt('This will prevent creation of additional simple pages in this course.'); + ' '.&mt('This will prevent creation of additional simple pages in this course.'); } else { - $lockerrorsref->{$prefix} .= &mt('This will prevent creation of additional bulletin boards in this course.'); + $lockerrorsref->{$prefix} .= ' '.&mt('This will prevent creation of additional bulletin boards in this course.'); } - $lockerrorsref->{$prefix} .= &mt('Please contact the domain coordinator for your LON-CAPA domain.').''; + $lockerrorsref->{$prefix} .= ' '.&mt('Please contact the [_1]helpdesk[_2] for assistance.', + '',''). + ''; } } } elsif ($url =~ m{/syllabus$}) { @@ -3290,7 +3293,7 @@ $form_common."\n". push(@{$filtersref->{'randomorder'}},$orderidx); } } - my $formname = 'edit_rorder_'.$orderidx; + $formname = 'edit_rorder_'.$orderidx; $rand_order_text = '