--- loncom/interface/lonmeta.pm 2002/10/25 13:50:48 1.24 +++ loncom/interface/lonmeta.pm 2003/06/30 17:17:30 1.32 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.24 2002/10/25 13:50:48 www Exp $ +# $Id: lonmeta.pm,v 1.32 2003/06/30 17:17:30 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -51,10 +51,13 @@ sub dynamicmeta { $regexp='___'.$regexp.'___'; my %evaldata=&Apache::lonnet::dump('nohist_resevaldata',$adomain, $aauthor,$regexp); - my %sum; - my %cnt; + my %sum=(); + my %cnt=(); + my %concat=(); my %listitems=('count' => 'add', 'course' => 'add', + 'goto' => 'add', + 'comefrom' => 'add', 'avetries' => 'avg', 'stdno' => 'add', 'difficulty' => 'avg', @@ -67,21 +70,24 @@ sub dynamicmeta { 'usage' => 'cnt' ); foreach (keys %evaldata) { - $_=~/___(\w+)$/; - if (defined($cnt{$1})) { $cnt{$1}++; } else { $cnt{$1}=1; } - unless ($listitems{$1} eq 'app') { - if (defined($sum{$1})) { - $sum{$1}+=$evaldata{$_}; + my ($item,$purl,$cat)=split(/\_\_\_/,$_); +### print "\n".$_.' - '.$item.'
'; + if (defined($cnt{$cat})) { $cnt{$cat}++; } else { $cnt{$cat}=1; } + unless ($listitems{$cat} eq 'app') { + if (defined($sum{$cat})) { + $sum{$cat}+=$evaldata{$_}; + $concat{$cat}.=','.$item; } else { - $sum{$1}=$evaldata{$_}; + $sum{$cat}=$evaldata{$_}; + $concat{$cat}=$item; } } else { - if (defined($sum{$1})) { + if (defined($sum{$cat})) { if ($evaldata{$_}) { - $sum{$1}.='
'.$evaldata{$_}; + $sum{$cat}.='
'.$evaldata{$_}; } } else { - $sum{$1}=''.$evaldata{$_}; + $sum{$cat}=''.$evaldata{$_}; } } } @@ -94,10 +100,38 @@ sub dynamicmeta { } else { $returnhash{$_}=$sum{$_}; } + $returnhash{$_.'_list'}=$concat{$_}; +### print "\n
".$_.': '.$returnhash{$_}.'
'.$returnhash{$_.'_list'}; } return %returnhash; } +# ------------------------------------- Try to make an alt tag if there is none + +sub alttag { + my ($base,$src)=@_; + my $fullpath=&Apache::lonnet::hreflocation($base,$src); + my $alttag=&Apache::lonnet::metadata($fullpath,'title').' '. + &Apache::lonnet::metadata($fullpath,'subject').' '. + &Apache::lonnet::metadata($fullpath,'abstract'); + $alttag=~s/\s+/ /gs; + $alttag=~s/\"//gs; + $alttag=~s/\'//gs; + $alttag=~s/\s+$//gs; + $alttag=~s/^\s+//gs; + if ($alttag) { return $alttag; } else + { return 'No information available'; } +} + +# -------------------------------------------------------------- Author display + +sub authordisplay { + my ($aname,$adom)=@_; + return &Apache::loncommon::aboutmewrapper( + &Apache::loncommon::plainname($aname,$adom), + $aname,$adom).' ['.$aname.'@'.$adom.']'; +} + # -------------------------------------------------------------- Pretty display sub evalgraph { @@ -193,6 +227,10 @@ my $mime=&Apache::loncommon::filedescrip my $disuri=&Apache::lonnet::declutter($uri); $disuri=~s/\.meta$//; my $currentversion=&Apache::lonnet::getversion($disuri); +my $author=$content{'author'}; +$author=~s/(\w+)(\:|\@)(\w+)/&authordisplay($1,$3)/gse; +my $owner=$content{'owner'}; +$owner=~s/(\w+)(\:|\@)(\w+)/&authordisplay($1,$3)/gse; my $versiondisplay=''; if ($thisversion) { $versiondisplay='Version: '.$thisversion. @@ -200,6 +238,11 @@ if ($thisversion) { } else { $versiondisplay='Version: '.$currentversion; } +my $customdistributionfile=''; +if ($content{'customdistributionfile'}) { + $customdistributionfile=''.$content{'customdistributionfile'}.''; +} my $bodytag=&Apache::loncommon::bodytag ('Catalog Information','','','',$resdomain); $r->print(< - + @@ -228,9 +271,11 @@ $versiondisplay
- + - + +
Author(s)$content{'author'} 
$author 
Subject $content{'subject'} 
Keyword(s)
Last Revision Date$lastrevisiondate 
Publisher/Owner$content{'owner'} 
$owner 
Copyright/Distribution$content{'copyright'} +$content{'copyright'} 
Custom Distribution File$customdistributionfile 
ENDHEAD delete($content{'title'}); @@ -254,6 +299,8 @@ ENDHEAD 'count' => 'Network-wide number of accesses (hits)', 'course' => 'Network-wide number of courses using resource', 'usage' => 'Number of resources using or importing resource', + 'goto' => 'Number of resources that follow this resource in maps', + 'comefrom' => 'Number of resources that lead up to this resource in maps', 'clear' => 'Material presented in clear way', 'depth' => 'Material covered with sufficient depth', 'helpful' => 'Material is helpful', @@ -265,11 +312,31 @@ ENDHEAD my %dynmeta=&dynamicmeta($uri); $r->print( '

Access and Usage Statistics

'); - foreach ('count','usage','course') { + foreach ('count') { $r->print( '\n"); } + foreach my $cat ('usage','comefrom','goto') { + $r->print( +'\n"); + } + foreach my $cat ('course') { + $r->print( +'\n"); + } $r->print('
'.$items{$_}.''. $dynmeta{$_}." 
'.$items{$cat}.''. +$dynmeta{$cat}.'
'.$items{$cat}.''. +$dynmeta{$cat}.'
'); if ($uri=~/\.(problem|exam|quiz|assess|survey|form)\.meta$/) { $r->print( @@ -303,7 +370,7 @@ $dynmeta{$_}." \n"); '

Error Messages (visible to author and co-authors only)

'); my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$1,$2); foreach (keys %errormsgs) { - if ($_=~/^$disuri\_\d+$/) { + if ($_=~/^\Q$disuri\E\_\d+$/) { my %content=&Apache::lonmsg::unpackagemsg($errormsgs{$_}); $r->print(''.$content{'time'}.': '.$content{'message'}. '
'); @@ -363,13 +430,24 @@ $bodytag
ENDEDIT foreach ('author','title','subject','keywords','abstract','notes', - 'copyright','language') { + 'copyright','customdistributionfile','language') { if ($ENV{'form.new_'.$_}) { $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_}; } - $r->print( - &Apache::lonpublisher::textfield($_,'new_'.$_, - $Apache::lonpublisher::metadatafields{$_})); + if (m/copyright/) { + $r->print(&Apache::lonpublisher::selectbox($_,'new_'.$_, + $Apache::lonpublisher::metadatafields{$_}, + \&Apache::loncommon::copyrightdescription, + (&Apache::loncommon::copyrightids))); + } elsif (m/language/) { + $r->print(&Apache::lonpublisher::selectbox($_,'new_'.$_, + $Apache::lonpublisher::metadatafields{$_}, + \&Apache::loncommon::languagedescription, + (&Apache::loncommon::languageids))); + } else { + $r->print(&Apache::lonpublisher::textfield($_,'new_'.$_, + $Apache::lonpublisher::metadatafields{$_})); + } } if ($ENV{'form.store'}) { my $mfh;