--- loncom/interface/lonmeta.pm 2003/04/14 13:46:53 1.30 +++ loncom/interface/lonmeta.pm 2003/12/29 17:11:53 1.46 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.30 2003/04/14 13:46:53 www Exp $ +# $Id: lonmeta.pm,v 1.46 2003/12/29 17:11:53 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,8 +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 @@ -54,7 +56,7 @@ sub dynamicmeta { my %sum=(); my %cnt=(); my %concat=(); - my %listitems=('count' => 'add', + my %listitems=( 'course' => 'add', 'goto' => 'add', 'comefrom' => 'add', @@ -69,10 +71,10 @@ sub dynamicmeta { 'comments' => 'app', 'usage' => 'cnt' ); - foreach (keys %evaldata) { - my ($item,$purl,$cat)=split(/\_\_\_/,$_); -### print "\n".$_.' - '.$item.'
'; - if (defined($cnt{$cat})) { $cnt{$cat}++; } else { $cnt{$cat}=1; } + while ($_=each(%evaldata)) { + my ($item,$purl,$cat)=split(/___/,$_); + ### Apache->request->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{$_}; @@ -84,7 +86,7 @@ sub dynamicmeta { } else { if (defined($sum{$cat})) { if ($evaldata{$_}) { - $sum{$cat}.='
'.$evaldata{$_}; + $sum{$cat}.='
'.$evaldata{$_}; } } else { $sum{$cat}=''.$evaldata{$_}; @@ -92,7 +94,7 @@ sub dynamicmeta { } } my %returnhash=(); - foreach (keys %cnt) { + while ($_=each(%cnt)) { if ($listitems{$_} eq 'avg') { $returnhash{$_}=int(($sum{$_}/$cnt{$_})*100.0+0.5)/100.0; } elsif ($listitems{$_} eq 'cnt') { @@ -101,11 +103,26 @@ sub dynamicmeta { $returnhash{$_}=$sum{$_}; } $returnhash{$_.'_list'}=$concat{$_}; -### print "\n
".$_.': '.$returnhash{$_}.'
'.$returnhash{$_.'_list'}; + ### Apache->request->print("\n
".$_.': '.$returnhash{$_}.'
'.$returnhash{$_.'_list'}); } + # + # Deal with 'count' separately + $returnhash{'count'} = &access_count($url,$aauthor,$adomain); + return %returnhash; } +sub access_count { + my ($src,$author,$adomain) = @_; + my %countdata=&Apache::lonnet::dump('nohist_accesscount',$adomain, + $author,$src); + if (! exists($countdata{$src})) { + return 'Not Available'; + } else { + return $countdata{$src}; + } +} + # ------------------------------------- Try to make an alt tag if there is none sub alttag { @@ -129,7 +146,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 @@ -174,6 +191,132 @@ 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', + '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' + ); +} + +# =========================================== 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; + } +# 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 { @@ -199,7 +342,7 @@ sub handler { # ----------------------------------------------------------- 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; @@ -212,106 +355,80 @@ sub handler { unless ($ENV{'user.adv'}) { foreach ('keywords','notes','abstract','subject') { - $content{$_}='- not displayed -'; + $content{$_}='- '.&mt('not displayed').' -'; } } # --------------------------------------------------------------- Render Output - my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/); -my $creationdate=localtime( - &Apache::loncommon::unsqltime($content{'creationdate'})); -my $lastrevisiondate=localtime( - &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='Version: '.$thisversion. - ' (most recent version: '.$currentversion.')'; -} else { - $versiondisplay='Version: '.$currentversion; -} -my $customdistributionfile=''; -if ($content{'customdistributionfile'}) { - $customdistributionfile=''.$content{'customdistributionfile'}.''; -} -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.')'; + } 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

$content{'title'}

$disuri

+$obsoletewarning $versiondisplay
- - - - - - - - - - - - - - - - - - - - - - - +$table
Author(s)$author 
Subject$content{'subject'} 
Keyword(s)$content{'keywords'} 
Notes$content{'notes'} 
Abstract$content{'abstract'} 
MIME Type$mime ($content{'mime'}) 
Language$language 
Creation Date$creationdate 
-Last Revision Date$lastrevisiondate 
Publisher/Owner$owner 
Copyright/Distribution$content{'copyright'} 
Custom Distribution File$customdistributionfile 
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'}); if ($ENV{'user.adv'}) { # ------------------------------------------------------------ Dynamic Metadata $r->print( - '

Dynamic Metadata (updated periodically)

Processing ...
'); + '

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

'.&mt('Processing'). + ' ...
'); $r->rflush(); - my %items=( - '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 %items=&fieldnames(); my %dynmeta=&dynamicmeta($uri); $r->print( -'

Access and Usage Statistics

'); +'

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

'); foreach ('count') { $r->print( '\n"); foreach my $cat ('usage','comefrom','goto') { $r->print( '\n"); +$dynmeta{$cat}.'\n"); } - foreach ('course') { + foreach my $cat ('course') { $r->print( -'\n"); +'\n"); } $r->print('
'.$items{$_}.''. @@ -320,21 +437,27 @@ $dynmeta{$_}." 
'.$items{$cat}.''. -$dynmeta{$_}.'
'.join('
', - map { ''. - &Apache::lonnet::gettitle($_).' ['. - $_.']' } - split(/\,/,$dynmeta{$cat.'_list'}))."
'.$items{$_}.''. -$dynmeta{$_}." 
'.$items{$cat}.''. +$dynmeta{$cat}.'
'); if ($uri=~/\.(problem|exam|quiz|assess|survey|form)\.meta$/) { $r->print( -'

Assessment Statistical Data

'); +'

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

'); foreach ('stdno','avetries') { $r->print( '\n"); } $r->print('
'.$items{$_}.''. @@ -347,7 +470,7 @@ $dynmeta{$_}." 
'); } - $r->print('

Evaluation Data

'); + $r->print('

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

'); foreach ('clear','depth','helpful','correct','technical') { $r->print( '\n"); if ((($ENV{'user.domain'} eq $1) && ($ENV{'user.name'} eq $2)) || ($ENV{'user.role.ca./'.$1.'/'.$2})) { $r->print( - '

Evaluation Comments (visible to author and co-authors only)

'. + '

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

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

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

'); + '

'.&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+$/) { @@ -373,23 +497,25 @@ $dynmeta{$_}." \n"); } # ------------------------------------------------------------- All other stuff $r->print( - '

Additional Metadata (non-standard, parameters, exports)

'); + '

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

'); foreach (sort keys %content) { my $name=$_; - 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.')'); + 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("
\n"); } } # ===================================================== End Resource Space Call @@ -398,7 +524,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; @@ -412,7 +538,8 @@ $dynmeta{$_}." \n"); if ($disuri=~/\/default$/) { my $dir=$disuri; $dir=~s/default$//; - $displayfile='Default Cataloging Information for Directory '.$dir; + $displayfile=&mt('Default Cataloging Information for Directory').' '. + $dir; } %Apache::lonpublisher::metadatafields=(); %Apache::lonpublisher::metadatakeys=(); @@ -423,20 +550,35 @@ $bodytag

$displayfile

ENDEDIT + my %lt=&fieldnames(); foreach ('author','title','subject','keywords','abstract','notes', - 'copyright','customdistributionfile','language') { + 'copyright','customdistributionfile','language', + 'obsolete','obsoletereplacement') { 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($lt{$_},'new_'.$_, + ($Apache::lonpublisher::metadatafields{$_}? + $Apache::lonpublisher::metadatafields{$_}:'default'), + \&Apache::loncommon::copyrightdescription, + (&Apache::loncommon::copyrightids))); + } elsif (m/language/) { + $r->print(&Apache::lonpublisher::selectbox($lt{$_},'new_'.$_, + $Apache::lonpublisher::metadatafields{$_}, + \&Apache::loncommon::languagedescription, + (&Apache::loncommon::languageids))); + } else { + $r->print(&Apache::lonpublisher::textfield($lt{$_},'new_'.$_, + $Apache::lonpublisher::metadatafields{$_})); + } } if ($ENV{'form.store'}) { my $mfh; unless ($mfh=Apache::File->new('>'.$fn)) { $r->print( - '

Could not write metadata, FAIL'); + '

'.&mt('Could not write metadata').', '. + &mt('FAIL').''); } else { foreach (sort keys %Apache::lonpublisher::metadatafields) { unless ($_=~/\./) { @@ -457,15 +599,21 @@ ENDEDIT .''; } } - $r->print('

Wrote Metadata'); + $r->print('

'.&mt('Wrote Metadata')); } } $r->print( - '
'); + '
'); return OK; } } +# ================================================================= BEGIN Block +BEGIN { +# Get columns of MySQL metadata table + @columns=&Apache::lonmysql::col_order('metadata'); +} 1; __END__

'.$items{$_}.''. @@ -358,10 +481,11 @@ $dynmeta{$_}."