--- loncom/interface/lonmeta.pm 2003/12/26 21:17:37 1.43
+++ 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.43 2003/12/26 21:17:37 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,11 +32,16 @@ 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
sub dynamicmeta {
@@ -86,7 +86,7 @@ sub dynamicmeta {
} else {
if (defined($sum{$cat})) {
if ($evaldata{$_}) {
- $sum{$cat}.='
'.$evaldata{$_};
+ $sum{$cat}.='
'.$evaldata{$_};
}
} else {
$sum{$cat}=''.$evaldata{$_};
@@ -106,7 +106,7 @@ sub dynamicmeta {
### Apache->request->print("\n
".$_.': '.$returnhash{$_}.'
'.$returnhash{$_.'_list'});
}
#
- # Deal with 'count' seperately
+ # Deal with 'count' separately
$returnhash{'count'} = &access_count($url,$aauthor,$adomain);
return %returnhash;
@@ -146,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
@@ -191,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 {
@@ -234,60 +360,53 @@ sub handler {
}
# --------------------------------------------------------------- Render Output
- my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/);
-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);
- $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',
- '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
+# 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
@@ -296,57 +415,9 @@ $bodytag
$obsoletewarning
$versiondisplay
-$lt{'au'} |
-$author |
-$lt{'sb'} |
-$content{'subject'} |
-$lt{'kw'} |
-$content{'keywords'} |
-$lt{'no'} |
-$content{'notes'} |
-$lt{'ab'} |
-$content{'abstract'} |
-$lt{'lg'} |
-$content{'lowestgradelevel'} |
-$lt{'hg'} |
-$content{'highestgradelevel'} |
-$lt{'st'} |
-$content{'standards'} |
-$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 |
+$table
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(
@@ -354,20 +425,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').'
');
@@ -466,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;
@@ -492,6 +550,7 @@ $bodytag
$displayfile