--- loncom/interface/lonmeta.pm 2003/12/22 21:44:17 1.41 +++ loncom/interface/lonmeta.pm 2003/12/29 19:01:27 1.47 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.41 2003/12/22 21:44:17 www Exp $ +# $Id: lonmeta.pm,v 1.47 2003/12/29 19:01:27 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -24,12 +24,7 @@ # /home/httpd/html/adm/gpl.txt # # http://www.lon-capa.org/ -# -# (TeX Content Handler -# -# 05/29/00,05/30,10/11 Gerd Kortemeyer) -# -# 10/19,10/21,10/23,11/27,08/09/01,12/22,12/24,12/25 Gerd Kortemeyer + package Apache::lonmeta; @@ -37,9 +32,15 @@ use strict; use Apache::Constants qw(:common); use Apache::lonnet(); use Apache::loncommon(); +use Apache::lonhtmlcommon(); use Apache::lonmsg; use Apache::lonpublisher; use Apache::lonlocal; +use Apache::lonmysql; + +# MySQL table columns + +my @columns; # ----------------------------------------- Fetch and evaluate dynamic metadata @@ -85,7 +86,7 @@ sub dynamicmeta { } else { if (defined($sum{$cat})) { if ($evaldata{$_}) { - $sum{$cat}.='
'.$evaldata{$_}; + $sum{$cat}.='
'.$evaldata{$_}; } } else { $sum{$cat}=''.$evaldata{$_}; @@ -105,8 +106,11 @@ sub dynamicmeta { ### Apache->request->print("\n
".$_.': '.$returnhash{$_}.'
'.$returnhash{$_.'_list'}); } # - # Deal with 'count' seperately + # Deal with 'count' separately $returnhash{'count'} = &access_count($url,$aauthor,$adomain); + # since "usage" is reserved word in MySQL ... + $returnhash{'sequsage'}=$returnhash{'usage'}; + $returnhash{'sequsage_list'}=$returnhash{'usage_list'}; return %returnhash; } @@ -116,7 +120,7 @@ sub access_count { my %countdata=&Apache::lonnet::dump('nohist_accesscount',$adomain, $author,$src); if (! exists($countdata{$src})) { - return 'Not Available'; + return &mt('Not Available'); } else { return $countdata{$src}; } @@ -136,7 +140,7 @@ sub alttag { $alttag=~s/\s+$//gs; $alttag=~s/^\s+//gs; if ($alttag) { return $alttag; } else - { return 'No information available'; } + { return &mt('No information available'); } } # -------------------------------------------------------------- Author display @@ -145,7 +149,7 @@ sub authordisplay { my ($aname,$adom)=@_; return &Apache::loncommon::aboutmewrapper( &Apache::loncommon::plainname($aname,$adom), - $aname,$adom).' ['.$aname.'@'.$adom.']'; + $aname,$adom,'preview').' ['.$aname.'@'.$adom.']'; } # -------------------------------------------------------------- Pretty display @@ -190,6 +194,138 @@ sub diffgraph { return $output; } +# ==================================================== Turn MySQL row into hash + +sub metadata_col_to_hash { + my @cols=@_; + my %hash=(); + for (my $i=0; $i<=$#columns; $i++) { + $hash{$columns[$i]}=$cols[$i]; + } + return %hash; +} + +# ============================================================= The field names + +sub fieldnames { + return &Apache::lonlocal::texthash( + 'title' => 'Title', + 'author' =>'Author(s)', + 'subject' => 'Subject', + 'keywords' => 'Keyword(s)', + 'notes' => 'Notes', + 'abstract' => 'Abstract', + 'lowestgradelevel' => 'Lowest Grade Level', + 'highestgradelevel' => 'Highest Grade Level', + 'standards' => 'Standards', + 'mime' => 'MIME Type', + 'language' => 'Language', + 'creationdate' => 'Creation Date', + 'lastrevisiondate' => 'Last Revision Date', + 'owner' => 'Publisher/Owner', + 'copyright' => 'Copyright/Distribution', + 'customdistributionfile' => 'Custom Distribution File', + 'obsolete' => 'Obsolete', + 'obsoletereplacement' => 'Suggested Replacement for Obsolete File', + 'count' => 'Network-wide number of accesses (hits)', + 'course' => 'Network-wide number of courses using resource', + 'course_list' => 'Network-wide courses using resource', + 'sequsage' => 'Number of resources using or importing resource', + 'sequsage_list' => 'Resources using or importing resource', + 'goto' => 'Number of resources that follow this resource in maps', + 'goto_list' => 'Resources that follow this resource in maps', + 'comefrom' => 'Number of resources that lead up to this resource in maps', + 'comefrom_list' => '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', + 'correct' => 'Material appears to be correct', + 'technical' => 'Resource is technically correct', + 'avetries' => 'Average number of tries till solved', + 'stdno' => 'Total number of students who have worked on this problem', + 'difficulty' => 'Degree of difficulty' + ); +} + +# =========================================== Pretty printing of metadata field + +sub prettyprint { + my ($type,$value)=@_; + unless (defined($value)) { return ' '; } +# Title + if ($type eq 'title') { + return ''.$value.''; + } +# Dates + if (($type eq 'creationdate') || + ($type eq 'lastrevisiondate')) { + return &Apache::lonlocal::locallocaltime( + &Apache::lonmysql::unsqltime($value)); + } +# Language + if ($type eq 'language') { + return &Apache::loncommon::languagedescription($value); + } +# Copyright + if ($type eq 'copyright') { + return &Apache::loncommon::copyrightdescription($value); + } +# MIME + if ($type eq 'mime') { + return ' '. + &Apache::loncommon::filedescription($value); + } +# Person + if (($type eq 'author') || + ($type eq 'owner') || + ($type eq 'modifyinguser') || + ($type eq 'authorspace')) { + $value=~s/(\w+)(\:|\@)(\w+)/&authordisplay($1,$3)/gse; + return $value; + } +# Only for advance users below + unless ($ENV{'user.adv'}) { return '- '.&mt('not displayed').' -' }; +# File + if (($type eq 'customdistributionfile') || + ($type eq 'obsoletereplacement') || + ($type eq 'goto_list') || + ($type eq 'comefrom_list') || + ($type eq 'sequsage_list')) { + return join('
',map { + &Apache::lonnet::gettitle($_).' ['. + &Apache::lonhtmlcommon::crumbs(&Apache::lonnet::clutter($_),'preview').']'; + } split(/\s*\,\s*/,$value)); + } +# Evaluations + if (($type eq 'clear') || + ($type eq 'depth') || + ($type eq 'helpful') || + ($type eq 'correct') || + ($type eq 'technical')) { + return &evalgraph($value); + } +# Difficulty + if ($type eq 'difficulty') { + return &diffgraph($value); + } +# List of courses + if ($type=~/\_list/) { + return join('
',map { + my %courseinfo=&Apache::lonnet::coursedescription($_); + ''. + $courseinfo{'description'}.''; + } split(/\s*\,\s*/,$value)); + } +# No pretty print found + return $value; +} +# ============================================== Pretty input of metadata field + +sub prettyinput { + my ($type,$value,$fieldname)=@_; +} + # ================================================================ Main Handler sub handler { @@ -224,66 +360,55 @@ sub handler { foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) { $content{$_}=&Apache::lonnet::metadata($uri,$_); } -# ------------------------------------------------------------------ Hide stuff - - unless ($ENV{'user.adv'}) { - foreach ('keywords','notes','abstract','subject') { - $content{$_}='- '.&mt('not displayed').' -'; - } - } - # --------------------------------------------------------------- Render Output - my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/); -my $creationdate=&Apache::lonlocal::locallocaltime( - &Apache::loncommon::unsqltime($content{'creationdate'})); -my $lastrevisiondate=&Apache::lonlocal::locallocaltime( - &Apache::loncommon::unsqltime($content{'lastrevisiondate'})); -my $language=&Apache::loncommon::languagedescription($content{'language'}); -my $mime=&Apache::loncommon::filedescription($content{'mime'}); -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=&mt('Version').': '.$thisversion. - ' ('.&mt('most recent version').': '.$currentversion.')'; -} else { - $versiondisplay='Version: '.$currentversion; -} -my $customdistributionfile=''; -if ($content{'customdistributionfile'}) { - $customdistributionfile=''.$content{'customdistributionfile'}.''; -} - -my $obsolete=$content{'obsolete'}; -my $obsoletereplace=$content{'obsoletereplacement'}; -my $obsoletewarning=''; -if (($obsolete) && ($ENV{'user.adv'})) { - $obsoletewarning='

'.&mt('This resource has been marked obsolete by the author(s)').'

'; -} - -my %lt=&Apache::lonlocal::texthash( - 'au' =>'Author(s)', - 'sb' => 'Subject', - 'kw' => 'Keyword(s)', - 'no' => 'Notes', - 'ab' => 'Abstract', - 'mi' => 'MIME Type', - 'la' => 'Language', - 'cd' => 'Creation Date', - 'pu' => 'Publisher/Owner', - 'co' => 'Copyright/Distribution', - 'cf' => 'Custom Distribution File', - 'ob' => 'Obsolete', - 'or' => - 'Suggested Replacement for Obsolete File'); -my $bodytag=&Apache::loncommon::bodytag +# displayed url + my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/); + my $disuri=&Apache::lonnet::clutter($uri); + $disuri=~s/\.meta$//; + $disuri=&Apache::lonhtmlcommon::crumbs($disuri); +# version + my $currentversion=&Apache::lonnet::getversion($disuri); + my $versiondisplay=''; + if ($thisversion) { + $versiondisplay=&mt('Version').': '.$thisversion. + ' ('.&mt('most recent version').': '. + ($currentversion>0?$currentversion:&mt('information not available')).')'; + } else { + $versiondisplay='Version: '.$currentversion; + } +# obsolete + my $obsolete=$content{'obsolete'}; + my $obsoletewarning=''; + if (($obsolete) && ($ENV{'user.adv'})) { + $obsoletewarning='

'. + &mt('This resource has been marked obsolete by the author(s)').'

'; + } + + my %lt=&fieldnames(); + my $table=''; + my $bodytag=&Apache::loncommon::bodytag ('Catalog Information','','','',$resdomain); + foreach ('title', + 'author', + 'subject', + 'keywords', + 'notes', + 'abstract', + 'mime', + 'language', + 'creationdate', + 'lastrevisiondate', + 'owner', + 'copyright', + 'customdistributionfile', + 'obsolete', + 'obsoletereplacement') { + $table.=''.$lt{$_}. + ''. + &prettyprint($_,$content{$_}).''; + delete $content{$_}; + } + $r->print(<Catalog Information $bodytag @@ -292,163 +417,84 @@ $bodytag $obsoletewarning $versiondisplay
- - - - - - - - - - - - - - - - - - - - - - - - - - - +$table
$lt{'au'}$author 
$lt{'sb'}$content{'subject'} 
$lt{'kw'}$content{'keywords'} 
$lt{'no'}$content{'notes'} 
$lt{'ab'}$content{'abstract'} 
$lt{'mi'}$mime ($content{'mime'}) 
$lt{'la'}$language 
$lt{'cd'}$creationdate 
-Last Revision Date$lastrevisiondate 
$lt{'pu'}$owner 
$lt{'co'}$content{'copyright'} 
$lt{'cf'}$customdistributionfile 
$lt{'ob'}$obsolete 
$lt{'or'}$obsoletereplace 
ENDHEAD - delete($content{'title'}); - delete($content{'author'}); - delete($content{'subject'}); - delete($content{'keywords'}); - delete($content{'notes'}); - delete($content{'abstract'}); - delete($content{'mime'}); - delete($content{'language'}); - delete($content{'creationdate'}); - delete($content{'lastrevisiondate'}); - delete($content{'owner'}); - delete($content{'copyright'}); - delete($content{'customdistributionfile'}); - delete($content{'obsolete'}); - delete($content{'obsoletereplacement'}); if ($ENV{'user.adv'}) { # ------------------------------------------------------------ Dynamic Metadata - $r->print( - '

'.&mt('Dynamic Metadata').' ('. - &mt('updated periodically').')

'.&mt('Processing'). - ' ...
'); - $r->rflush(); - my %items=&Apache::lonlocal::texthash( - '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', - 'correct' => 'Material appears to be correct', - 'technical' => 'Resource is technically correct', - 'avetries' => 'Average number of tries till solved', - 'stdno' => 'Total number of students who have worked on this problem', - 'difficulty' => 'Degree of difficulty'); - my %dynmeta=&dynamicmeta($uri); - $r->print( -'

'.&mt('Access and Usage Statistics').'

'); - 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( -'

'.&mt('Assessment Statistical Data').'

'); - foreach ('stdno','avetries') { - $r->print( -'\n"); + '

'.&mt('Dynamic Metadata').' ('. + &mt('updated periodically').')

'.&mt('Processing'). + ' ...
'); + $r->rflush(); + my %items=&fieldnames(); + my %dynmeta=&dynamicmeta($uri); +# General Access and Usage Statistics + $r->print('

'.&mt('Access and Usage Statistics').'

'.$items{$_}.''. -$dynmeta{$_}." 
'); + foreach ('count', + 'sequsage','sequsage_list', + 'comefrom','comefrom_list', + 'goto','goto_list', + 'course','course_list') { + $r->print('\n"); } - foreach ('difficulty') { - $r->print( -'\n"); + $r->print('
'.$lt{$_}.''. + &prettyprint($dynmeta{$_})."
'.$items{$_}.''. -&diffgraph($dynmeta{$_})."
'); + if ($uri=~/\.(problem|exam|quiz|assess|survey|form)\.meta$/) { +# This is an assessment, print assessment data + $r->print( + '

'.&mt('Assessment Statistical Data').'

'); + foreach ('stdno','avetries','difficulty') { + $r->print('\n"); + } + $r->print('
'.$lt{$_}.''. + &prettyprint($dynmeta{$_})."
'); + } + $r->print('

'.&mt('Evaluation Data').'

'); + foreach ('clear','depth','helpful','correct','technical') { + $r->print('\n"); + } + $r->print('
'.$lt{$_}.''. + &prettyprint($dynmeta{$_})."
'); + $disuri=~/^(\w+)\/(\w+)\//; + if ((($ENV{'user.domain'} eq $1) && ($ENV{'user.name'} eq $2)) + || ($ENV{'user.role.ca./'.$1.'/'.$2})) { + $r->print( + '

'.&mt('Evaluation Comments').' ('.&mt('visible to author and co-authors only').')

'. + '
'.$dynmeta{'comments'}.'
'); + $r->print('

'.&mt('Error Messages').' ('. + &mt('visible to author and co-authors only').')

'); + my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$1,$2); + foreach (keys %errormsgs) { + if ($_=~/^\Q$disuri\E\_\d+$/) { + my %content=&Apache::lonmsg::unpackagemsg($errormsgs{$_}); + $r->print(''.$content{'time'}.': '.$content{'message'}. + '
'); + } + } } - $r->print(''); - } - $r->print('

'.&mt('Evaluation Data').'

'); - foreach ('clear','depth','helpful','correct','technical') { - $r->print( -'\n"); - } - $r->print('
'.$items{$_}.''. -&evalgraph($dynmeta{$_})."
'); - $disuri=~/^(\w+)\/(\w+)\//; - if ((($ENV{'user.domain'} eq $1) && ($ENV{'user.name'} eq $2)) - || ($ENV{'user.role.ca./'.$1.'/'.$2})) { - $r->print( - '

'.&mt('Evaluation Comments').' ('.&mt('visible to author and co-authors only').')

'. - '
'.$dynmeta{'comments'}.'
'); - $r->print( - '

'.&mt('Error Messages').' ('. - &mt('visible to author and co-authors only').')

'); - my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$1,$2); - foreach (keys %errormsgs) { - if ($_=~/^\Q$disuri\E\_\d+$/) { - my %content=&Apache::lonmsg::unpackagemsg($errormsgs{$_}); - $r->print(''.$content{'time'}.': '.$content{'message'}. - '
'); - } - } - } # ------------------------------------------------------------- All other stuff - $r->print( - '

'.&mt('Additional Metadata (non-standard, parameters, exports)').'

'); - foreach (sort keys %content) { - my $name=$_; - unless ($name=~/\.display$/) { - my $display=&Apache::lonnet::metadata($uri,$name.'.display'); - unless ($display) { $display=$name; }; - my $otherinfo=''; - foreach ('name','part','type','default') { - if (defined(&Apache::lonnet::metadata($uri,$name.'.'.$_))) { - $otherinfo.=' '.$_.'='. - &Apache::lonnet::metadata($uri,$name.'.'.$_).'; '; + $r->print( + '

'.&mt('Additional Metadata (non-standard, parameters, exports)').'

'); + foreach (sort keys %content) { + my $name=$_; + unless ($name=~/\.display$/) { + my $display=&Apache::lonnet::metadata($uri,$name.'.display'); + unless ($display) { $display=$name; }; + my $otherinfo=''; + foreach ('name','part','type','default') { + if (defined(&Apache::lonnet::metadata($uri,$name.'.'.$_))) { + $otherinfo.=' '.$_.'='. + &Apache::lonnet::metadata($uri,$name.'.'.$_).'; '; + } } + $r->print(''.$display.': '.$content{$name}); + if ($otherinfo) { + $r->print(' ('.$otherinfo.')'); + } + $r->print("
\n"); } - $r->print(''.$display.': '.$content{$name}); - if ($otherinfo) { - $r->print(' ('.$otherinfo.')'); - } - $r->print("
\n"); } - } } # ===================================================== End Resource Space Call } else { @@ -456,7 +502,7 @@ $dynmeta{$_}." \n"); # ----------------------------------------------------------- Set document type - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; @@ -482,6 +528,7 @@ $bodytag

$displayfile

ENDEDIT + my %lt=&fieldnames(); foreach ('author','title','subject','keywords','abstract','notes', 'copyright','customdistributionfile','language', 'obsolete','obsoletereplacement') { @@ -489,18 +536,18 @@ ENDEDIT $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_}; } if (m/copyright/) { - $r->print(&Apache::lonpublisher::selectbox($_,'new_'.$_, + $r->print(&Apache::lonpublisher::selectbox($lt{$_},'new_'.$_, ($Apache::lonpublisher::metadatafields{$_}? $Apache::lonpublisher::metadatafields{$_}:'default'), \&Apache::loncommon::copyrightdescription, (&Apache::loncommon::copyrightids))); } elsif (m/language/) { - $r->print(&Apache::lonpublisher::selectbox($_,'new_'.$_, + $r->print(&Apache::lonpublisher::selectbox($lt{$_},'new_'.$_, $Apache::lonpublisher::metadatafields{$_}, \&Apache::loncommon::languagedescription, (&Apache::loncommon::languageids))); } else { - $r->print(&Apache::lonpublisher::textfield($_,'new_'.$_, + $r->print(&Apache::lonpublisher::textfield($lt{$_},'new_'.$_, $Apache::lonpublisher::metadatafields{$_})); } } @@ -540,6 +587,11 @@ ENDEDIT } } +# ================================================================= BEGIN Block +BEGIN { +# Get columns of MySQL metadata table + @columns=&Apache::lonmysql::col_order('metadata'); +} 1; __END__