--- loncom/interface/lonmeta.pm 2002/10/18 13:49:49 1.22
+++ loncom/interface/lonmeta.pm 2003/09/27 13:20:46 1.37
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.22 2002/10/18 13:49:49 www Exp $
+# $Id: lonmeta.pm,v 1.37 2003/09/27 13:20:46 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -37,6 +37,9 @@ use strict;
use Apache::Constants qw(:common);
use Apache::lonnet();
use Apache::loncommon();
+use Apache::lonmsg;
+use Apache::lonpublisher;
+use Apache::lonlocal;
# ----------------------------------------- Fetch and evaluate dynamic metadata
@@ -49,10 +52,13 @@ sub dynamicmeta {
$regexp='___'.$regexp.'___';
my %evaldata=&Apache::lonnet::dump('nohist_resevaldata',$adomain,
$aauthor,$regexp);
- my %sum;
- my %cnt;
+ my %sum=();
+ my %cnt=();
+ my %concat=();
my %listitems=('count' => 'add',
'course' => 'add',
+ 'goto' => 'add',
+ 'comefrom' => 'add',
'avetries' => 'avg',
'stdno' => 'add',
'difficulty' => 'avg',
@@ -65,21 +71,24 @@ sub dynamicmeta {
'usage' => 'cnt'
);
foreach (keys %evaldata) {
- $_=~/___(\w+)$/;
- if (defined($cnt{$1})) { $cnt{$1}++; } else { $cnt{$1}=1; }
- unless ($listitems{$1} eq 'app') {
- if (defined($sum{$1})) {
- $sum{$1}+=$evaldata{$_};
+ my ($item,$purl,$cat)=&Apache::lonnet::decode_symb($_);
+### 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{$_};
+ $concat{$cat}.=','.$item;
} else {
- $sum{$1}=$evaldata{$_};
+ $sum{$cat}=$evaldata{$_};
+ $concat{$cat}=$item;
}
} else {
- if (defined($sum{$1})) {
+ if (defined($sum{$cat})) {
if ($evaldata{$_}) {
- $sum{$1}.='
'.$evaldata{$_};
+ $sum{$cat}.='
'.$evaldata{$_};
}
} else {
- $sum{$1}=''.$evaldata{$_};
+ $sum{$cat}=''.$evaldata{$_};
}
}
}
@@ -92,10 +101,38 @@ sub dynamicmeta {
} else {
$returnhash{$_}=$sum{$_};
}
+ $returnhash{$_.'_list'}=$concat{$_};
+### print "\n
".$_.': '.$returnhash{$_}.'
'.$returnhash{$_.'_list'};
}
return %returnhash;
}
+# ------------------------------------- Try to make an alt tag if there is none
+
+sub alttag {
+ my ($base,$src)=@_;
+ my $fullpath=&Apache::lonnet::hreflocation($base,$src);
+ my $alttag=&Apache::lonnet::metadata($fullpath,'title').' '.
+ &Apache::lonnet::metadata($fullpath,'subject').' '.
+ &Apache::lonnet::metadata($fullpath,'abstract');
+ $alttag=~s/\s+/ /gs;
+ $alttag=~s/\"//gs;
+ $alttag=~s/\'//gs;
+ $alttag=~s/\s+$//gs;
+ $alttag=~s/^\s+//gs;
+ if ($alttag) { return $alttag; } else
+ { return 'No information available'; }
+}
+
+# -------------------------------------------------------------- Author display
+
+sub authordisplay {
+ my ($aname,$adom)=@_;
+ return &Apache::loncommon::aboutmewrapper(
+ &Apache::loncommon::plainname($aname,$adom),
+ $aname,$adom).' ['.$aname.'@'.$adom.']';
+}
+
# -------------------------------------------------------------- Pretty display
sub evalgraph {
@@ -149,6 +186,8 @@ sub handler {
my $uri=$r->uri;
+ unless ($uri=~/^\/\~/) {
+# =========================================== This is not in construction space
my ($resdomain,$resuser)=
(&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//);
@@ -161,7 +200,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;
@@ -174,12 +213,12 @@ 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 ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/);
my $creationdate=localtime(
&Apache::loncommon::unsqltime($content{'creationdate'}));
my $lastrevisiondate=localtime(
@@ -189,6 +228,10 @@ my $mime=&Apache::loncommon::filedescrip
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.
@@ -196,6 +239,34 @@ if ($thisversion) {
} 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
('Catalog Information','','','',$resdomain);
$r->print(<$content{'title'}
$disuri
+$obsoletewarning
$versiondisplay
-| Author(s) |
-$content{'author'} |
-| Subject |
+
| $lt{'au'} |
+$author |
+| $lt{'sb'} |
$content{'subject'} |
-| Keyword(s) |
+
| $lt{'kw'} |
$content{'keywords'} |
-| Notes |
+
| $lt{'no'} |
$content{'notes'} |
-| Abstract |
+
| $lt{'ab'} |
$content{'abstract'} |
-| MIME Type |
+
| $lt{'mi'} |
$mime ($content{'mime'}) |
-| Language |
+
| $lt{'la'} |
$language |
-| Creation Date |
+
| $lt{'cd'} |
$creationdate |
|
Last Revision Date | $lastrevisiondate |
-| Publisher/Owner |
-$content{'owner'} |
-| Copyright/Distribution |
-$content{'copyright'}
+ |
| $lt{'pu'} |
+$owner |
+| $lt{'co'} |
+$content{'copyright'} |
+| $lt{'cf'} |
+$customdistributionfile |
+| $lt{'ob'} |
+$obsolete |
+| $lt{'or'} |
+$obsoletereplace |
ENDHEAD
delete($content{'title'});
@@ -241,15 +319,22 @@ 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',
+ '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',
@@ -260,16 +345,36 @@ ENDHEAD
'difficulty' => 'Degree of difficulty');
my %dynmeta=&dynamicmeta($uri);
$r->print(
-'Access and Usage Statistics
');
- foreach ('count','usage','course') {
+'
'.&mt('Access and Usage Statistics').'
');
+ foreach ('count') {
$r->print(
'| '.$items{$_}.' | '.
$dynmeta{$_}." |
\n");
}
+ foreach my $cat ('usage','comefrom','goto') {
+ $r->print(
+'| '.$items{$cat}.' | '.
+$dynmeta{$cat}.' |
\n");
+ }
+ foreach my $cat ('course') {
+ $r->print(
+'| '.$items{$cat}.' | '.
+$dynmeta{$cat}.' |
\n");
+ }
$r->print('
');
if ($uri=~/\.(problem|exam|quiz|assess|survey|form)\.meta$/) {
$r->print(
-'Assessment Statistical Data
');
+''.&mt('Assessment Statistical Data').'
');
foreach ('stdno','avetries') {
$r->print(
'| '.$items{$_}.' | '.
@@ -282,7 +387,7 @@ $dynmeta{$_}." |
\n");
}
$r->print('
');
}
- $r->print('Evaluation Data
');
+ $r->print(''.&mt('Evaluation Data').'
');
foreach ('clear','depth','helpful','correct','technical') {
$r->print(
'| '.$items{$_}.' | '.
@@ -293,32 +398,130 @@ $dynmeta{$_}." |
\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)
'.
- ''.$dynmeta{'comments'}.'
');
+ ''.&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(
- '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");
}
}
- $r->print('