--- loncom/lonnet/perl/lonnet.pm 2012/03/09 16:36:00 1.1157 +++ loncom/lonnet/perl/lonnet.pm 2012/03/15 18:15:55 1.1159 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.1157 2012/03/09 16:36:00 www Exp $ +# $Id: lonnet.pm,v 1.1159 2012/03/15 18:15:55 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3269,6 +3269,7 @@ sub flushcourselogs { } } else { my ($dom,$name) = ($entry=~m{___($match_domain)/($match_name)/(.*)___(\w+)$}); + if (($dom eq 'uploaded') || ($dom eq 'adm')) { next; } my %temphash=($entry => $accesshash{$entry}); if (&put('nohist_resevaldata',\%temphash,$dom,$name) eq 'ok') { delete $accesshash{$entry}; @@ -3379,7 +3380,13 @@ sub countacc { my $url=&declutter(shift); return if (! defined($url) || $url eq ''); unless ($env{'request.course.id'}) { return ''; } +# +# Mark that this url was used in this course +# $accesshash{$env{'request.course.id'}.'___'.$url.'___course'}=1; +# +# Increase the access count for this resource in this child process +# my $key=$$.$processmarker.'_'.$dumpcount.'___'.$url.'___count'; $accesshash{$key}++; } @@ -9398,6 +9405,9 @@ sub gettitle { } $title=~s/\&colon\;/\:/gs; if ($title) { +# Remember both $symb and $title for dynamic metadata + $accesshash{$symb.'___crstitle'}=$title; +# Cache this title and then return it return &do_cache_new('title',$key,$title,600); } $urlsymb=$url;