--- loncom/interface/lonmeta.pm 2003/11/12 21:38:35 1.40 +++ loncom/interface/lonmeta.pm 2003/12/29 15:10:54 1.45 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.40 2003/11/12 21:38:35 matthew Exp $ +# $Id: lonmeta.pm,v 1.45 2003/12/29 15:10:54 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; @@ -40,6 +35,11 @@ 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 @@ -190,6 +190,54 @@ 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' + ); +} # ================================================================ Main Handler sub handler { @@ -233,57 +281,64 @@ sub handler { } # --------------------------------------------------------------- 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 ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/); + $content{'creationdate'}=&Apache::lonlocal::locallocaltime( + &Apache::lonmysql::unsqltime($content{'creationdate'})); + $content{'lastrevisiondate'}=&Apache::lonlocal::locallocaltime( + &Apache::lonmysql::unsqltime($content{'lastrevisiondate'})); + $content{'language'}=&Apache::loncommon::languagedescription($content{'language'}); + $content{'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'}; + $content{'author'}=~s/(\w+)(\:|\@)(\w+)/&authordisplay($1,$3)/gse; + $content{'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; + } + if ($content{'customdistributionfile'}) { + $content{'customdistributionfile'}=''.$content{'customdistributionfile'}.''; + } else { + $content{'customdistributionfile'}=''; + } + 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=&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 + 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{$_}. + ''. + $content{$_}.' '; + delete $content{$_}; + } + $r->print(<Catalog Information $bodytag @@ -292,51 +347,9 @@ $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( @@ -344,20 +357,7 @@ ENDHEAD &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 %items=&fieldnames(); my %dynmeta=&dynamicmeta($uri); $r->print( '

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

'); @@ -456,7 +456,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 +482,7 @@ $bodytag

$displayfile

ENDEDIT + my %lt=&fieldnames(); foreach ('author','title','subject','keywords','abstract','notes', 'copyright','customdistributionfile','language', 'obsolete','obsoletereplacement') { @@ -489,17 +490,18 @@ ENDEDIT $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_}; } if (m/copyright/) { - $r->print(&Apache::lonpublisher::selectbox($_,'new_'.$_, - $Apache::lonpublisher::metadatafields{$_}, + $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{$_})); } } @@ -539,6 +541,11 @@ ENDEDIT } } +# ================================================================= BEGIN Block +BEGIN { +# Get columns of MySQL metadata table + @columns=&Apache::lonmysql::col_order('metadata'); +} 1; __END__