--- loncom/interface/londocs.pm 2004/08/29 06:35:41 1.139 +++ loncom/interface/londocs.pm 2004/09/02 15:26:40 1.140 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.139 2004/08/29 06:35:41 albertel Exp $ +# $Id: londocs.pm,v 1.140 2004/09/02 15:26:40 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -874,6 +874,7 @@ sub untiehash { sub checkonthis { my ($r,$url,$level,$title)=@_; + $url=&Apache::lonnet::unescape($url); $alreadyseen{$url}=1; $r->rflush(); if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) { @@ -960,7 +961,15 @@ sub verifycontent { %alreadyseen=(); &tiehash(); foreach (keys %hash) { - if (($_=~/^src\_(.+)$/) && (!$alreadyseen{$hash{$_}})) { + if ($hash{$_}=~/\.(page|sequence)$/) { + if (($_=~/^src_/) && ($alreadyseen{&Apache::lonnet::unescape($hash{$_})})) { + $r->print('
'. + &mt('The following sequence or page is included more than once in your course: '). + &Apache::lonnet::unescape($hash{$_}).'
'. + &mt('Note that grading records for problems included in this sequence or folder will overlap.
')); + } + } + if (($_=~/^src\_(.+)$/) && (!$alreadyseen{&Apache::lonnet::unescape($hash{$_})})) { &checkonthis($r,$hash{$_},0,$hash{'title_'.$1}); } }