--- loncom/interface/londocs.pm 2006/11/29 21:00:35 1.260 +++ loncom/interface/londocs.pm 2006/12/01 22:17:26 1.263 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.260 2006/11/29 21:00:35 www Exp $ +# $Id: londocs.pm,v 1.263 2006/12/01 22:17:26 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -936,7 +936,7 @@ sub group_import { my $idx = &LONCAPA::map::getresidx($url); $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx; my $ext = 'false'; - if ($url=~/^http:\/\//) { $ext = 'true'; } + if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; } $url =~ s/:/\:/g; $name =~ s/:/\:/g; $LONCAPA::map::resources[$idx] = @@ -1100,6 +1100,14 @@ sub docs_change_log { if ($docslog{$id}{'logentry'}{'currentfolder'} ne $folder) { next; } } my @changes=keys(%{$docslog{$id}{'logentry'}}); + if ($env{'form.displayfilter'} eq 'containing') { + my $wholeentry=$docslog{$id}{'exe_uname'}.':'.$docslog{$id}{'exe_udom'}.':'. + &Apache::loncommon::plainname($docslog{$id}{'exe_uname'},$docslog{$id}{'exe_udom'}); + foreach my $key (@changes) { + $wholeentry.=':'.$docslog{$id}{'logentry'}{$key}; + } + if ($wholeentry!~/\Q$env{'form.containingphrase'}\E/i) { next; } + } my $count = 0; my $time = &Apache::lonlocal::locallocaltime($docslog{$id}{'exe_time'});