--- loncom/interface/lonmeta.pm 2003/04/14 13:46:53 1.30 +++ loncom/interface/lonmeta.pm 2003/12/28 20:12:59 1.44 @@ -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.44 2003/12/28 20:12:59 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; @@ -39,6 +34,12 @@ use Apache::lonnet(); use Apache::loncommon(); use Apache::lonmsg; use Apache::lonpublisher; +use Apache::lonlocal; +use Apache::lonmysql; + +# MySQL table columns + +my @columns; # ----------------------------------------- Fetch and evaluate dynamic metadata @@ -54,7 +55,7 @@ sub dynamicmeta { my %sum=(); my %cnt=(); my %concat=(); - my %listitems=('count' => 'add', + my %listitems=( 'course' => 'add', 'goto' => 'add', 'comefrom' => 'add', @@ -69,10 +70,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{$_}; @@ -92,7 +93,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 +102,26 @@ sub dynamicmeta { $returnhash{$_}=$sum{$_}; } $returnhash{$_.'_list'}=$concat{$_}; -### print "\n
".$_.': '.$returnhash{$_}.'
'.$returnhash{$_.'_list'}; + ### Apache->request->print("\n
".$_.': '.$returnhash{$_}.'
'.$returnhash{$_.'_list'}); } + # + # Deal with 'count' seperately + $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 { @@ -174,6 +190,17 @@ 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; +} + # ================================================================ Main Handler sub handler { @@ -199,7 +226,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,16 +239,16 @@ 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 $creationdate=&Apache::lonlocal::locallocaltime( + &Apache::lonmysql::unsqltime($content{'creationdate'})); +my $lastrevisiondate=&Apache::lonlocal::locallocaltime( + &Apache::lonmysql::unsqltime($content{'lastrevisiondate'})); my $language=&Apache::loncommon::languagedescription($content{'language'}); my $mime=&Apache::loncommon::filedescription($content{'mime'}); my $disuri=&Apache::lonnet::declutter($uri); @@ -233,8 +260,8 @@ my $owner=$content{'owner'}; $owner=~s/(\w+)(\:|\@)(\w+)/&authordisplay($1,$3)/gse; my $versiondisplay=''; if ($thisversion) { - $versiondisplay='Version: '.$thisversion. - ' (most recent version: '.$currentversion.')'; + $versiondisplay=&mt('Version').': '.$thisversion. + ' ('.&mt('most recent version').': '.$currentversion.')'; } else { $versiondisplay='Version: '.$currentversion; } @@ -243,6 +270,32 @@ 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', + 'lg' => 'Lowest Grade Level', + 'hg' => 'Highest Grade Level', + 'st' => 'Standards', + '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 ('Catalog Information','','','',$resdomain); $r->print(<$content{'title'}

$disuri

+$obsoletewarning $versiondisplay
- + - + - + - + - + - + + + + + + + - + - + - + - + - + + + + +
Author(s)
$lt{'au'} $author 
Subject
$lt{'sb'} $content{'subject'} 
Keyword(s)
$lt{'kw'} $content{'keywords'} 
Notes
$lt{'no'} $content{'notes'} 
Abstract
$lt{'ab'} $content{'abstract'} 
MIME Type
$lt{'lg'}$content{'lowestgradelevel'} 
$lt{'hg'}$content{'highestgradelevel'} 
$lt{'st'}$content{'standards'} 
$lt{'mi'} $mime ($content{'mime'}) 
Language
$lt{'la'} $language 
Creation Date
$lt{'cd'} $creationdate 
Last Revision Date$lastrevisiondate 
Publisher/Owner
$lt{'pu'} $owner 
Copyright/Distribution
$lt{'co'} $content{'copyright'} 
Custom Distribution File
$lt{'cf'} $customdistributionfile 
$lt{'ob'}$obsolete 
$lt{'or'}$obsoletereplace 
ENDHEAD delete($content{'title'}); @@ -290,12 +354,17 @@ ENDHEAD 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( - '

Dynamic Metadata (updated periodically)

Processing ...
'); + '

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

'.&mt('Processing'). + ' ...
'); $r->rflush(); - my %items=( + 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', @@ -311,7 +380,7 @@ ENDHEAD 'difficulty' => 'Degree of difficulty'); 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 +389,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 +422,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 +449,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 @@ -412,7 +490,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=(); @@ -424,19 +503,33 @@ $bodytag ENDEDIT 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($_,'new_'.$_, + ($Apache::lonpublisher::metadatafields{$_}? + $Apache::lonpublisher::metadatafields{$_}:'default'), + \&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; 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 +550,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 +433,11 @@ $dynmeta{$_}."