--- loncom/interface/lonmeta.pm 2003/07/15 19:04:31 1.33
+++ loncom/interface/lonmeta.pm 2003/12/26 21:17:37 1.43
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.33 2003/07/15 19:04:31 www Exp $
+# $Id: lonmeta.pm,v 1.43 2003/12/26 21:17:37 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -39,6 +39,8 @@ use Apache::lonnet();
use Apache::loncommon();
use Apache::lonmsg;
use Apache::lonpublisher;
+use Apache::lonlocal;
+use Apache::lonmysql;
# ----------------------------------------- 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.'<br />';
- if (defined($cnt{$cat})) { $cnt{$cat}++; } else { $cnt{$cat}=1; }
+ while ($_=each(%evaldata)) {
+ my ($item,$purl,$cat)=split(/___/,$_);
+ ### Apache->request->print("\n".$_.' - '.$item.'<br />');
+ if (defined($cnt{$cat})) { $cnt{$cat}++; } else { $cnt{$cat}=1; }
unless ($listitems{$cat} eq 'app') {
if (defined($sum{$cat})) {
$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<hr />".$_.': '.$returnhash{$_}.'<br />'.$returnhash{$_.'_list'};
+ ### Apache->request->print("\n<hr />".$_.': '.$returnhash{$_}.'<br />'.$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 {
@@ -199,7 +216,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 +229,16 @@ sub handler {
unless ($ENV{'user.adv'}) {
foreach ('keywords','notes','abstract','subject') {
- $content{$_}='<i>- not displayed -</i>';
+ $content{$_}='<i>- '.&mt('not displayed').' -</i>';
}
}
# --------------------------------------------------------------- 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 +250,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 +260,32 @@ if ($content{'customdistributionfile'})
$customdistributionfile='<a href="'.$content{'customdistributionfile'}.
'"><tt>'.$content{'customdistributionfile'}.'</tt></a>';
}
+
+my $obsolete=$content{'obsolete'};
+my $obsoletereplace=$content{'obsoletereplacement'};
+my $obsoletewarning='';
+if (($obsolete) && ($ENV{'user.adv'})) {
+ $obsoletewarning='<p><font color="red">'.&mt('This resource has been marked obsolete by the author(s)').'</font></p>';
+}
+
+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(<<ENDHEAD);
@@ -250,32 +293,43 @@ my $bodytag=&Apache::loncommon::bodytag
$bodytag
<h2>$content{'title'}</h2>
<h3><tt>$disuri</tt></h3>
+$obsoletewarning
$versiondisplay<br />
<table cellspacing=2 border=0>
-<tr><td bgcolor='#AAAAAA'>Author(s)</td>
+<tr><td bgcolor='#AAAAAA'>$lt{'au'}</td>
<td bgcolor="#CCCCCC">$author </td></tr>
-<tr><td bgcolor='#AAAAAA'>Subject</td>
+<tr><td bgcolor='#AAAAAA'>$lt{'sb'}</td>
<td bgcolor="#CCCCCC">$content{'subject'} </td></tr>
-<tr><td bgcolor='#AAAAAA'>Keyword(s)</td>
+<tr><td bgcolor='#AAAAAA'>$lt{'kw'}</td>
<td bgcolor="#CCCCCC">$content{'keywords'} </td></tr>
-<tr><td bgcolor='#AAAAAA'>Notes</td>
+<tr><td bgcolor='#AAAAAA'>$lt{'no'}</td>
<td bgcolor="#CCCCCC">$content{'notes'} </td></tr>
-<tr><td bgcolor='#AAAAAA'>Abstract</td>
+<tr><td bgcolor='#AAAAAA'>$lt{'ab'}</td>
<td bgcolor="#CCCCCC">$content{'abstract'} </td></tr>
-<tr><td bgcolor='#AAAAAA'>MIME Type</td>
+<tr><td bgcolor='#AAAAAA'>$lt{'lg'}</td>
+<td bgcolor="#CCCCCC">$content{'lowestgradelevel'} </td></tr>
+<tr><td bgcolor='#AAAAAA'>$lt{'hg'}</td>
+<td bgcolor="#CCCCCC">$content{'highestgradelevel'} </td></tr>
+<tr><td bgcolor='#AAAAAA'>$lt{'st'}</td>
+<td bgcolor="#CCCCCC">$content{'standards'} </td></tr>
+<tr><td bgcolor='#AAAAAA'>$lt{'mi'}</td>
<td bgcolor="#CCCCCC">$mime ($content{'mime'}) </td></tr>
-<tr><td bgcolor='#AAAAAA'>Language</td>
+<tr><td bgcolor='#AAAAAA'>$lt{'la'}</td>
<td bgcolor="#CCCCCC">$language </td></tr>
-<tr><td bgcolor='#AAAAAA'>Creation Date</td>
+<tr><td bgcolor='#AAAAAA'>$lt{'cd'}</td>
<td bgcolor="#CCCCCC">$creationdate </td></tr>
<tr><td bgcolor='#AAAAAA'>
Last Revision Date</td><td bgcolor="#CCCCCC">$lastrevisiondate </td></tr>
-<tr><td bgcolor='#AAAAAA'>Publisher/Owner</td>
+<tr><td bgcolor='#AAAAAA'>$lt{'pu'}</td>
<td bgcolor="#CCCCCC">$owner </td></tr>
-<tr><td bgcolor='#AAAAAA'>Copyright/Distribution</td>
+<tr><td bgcolor='#AAAAAA'>$lt{'co'}</td>
<td bgcolor="#CCCCCC">$content{'copyright'} </td></tr>
-<tr><td bgcolor='#AAAAAA'>Custom Distribution File</td>
+<tr><td bgcolor='#AAAAAA'>$lt{'cf'}</td>
<td bgcolor="#CCCCCC">$customdistributionfile </td></tr>
+<tr><td bgcolor='#AAAAAA'>$lt{'ob'}</td>
+<td bgcolor="#CCCCCC">$obsolete </td></tr>
+<tr><td bgcolor='#AAAAAA'>$lt{'or'}</td>
+<td bgcolor="#CCCCCC">$obsoletereplace </td></tr>
</table>
ENDHEAD
delete($content{'title'});
@@ -291,12 +345,16 @@ ENDHEAD
delete($content{'owner'});
delete($content{'copyright'});
delete($content{'customdistributionfile'});
+ delete($content{'obsolete'});
+ delete($content{'obsoletereplacement'});
if ($ENV{'user.adv'}) {
# ------------------------------------------------------------ Dynamic Metadata
$r->print(
- '<h3>Dynamic Metadata (updated periodically)</h3>Processing ...<br>');
+ '<h3>'.&mt('Dynamic Metadata').' ('.
+ &mt('updated periodically').')</h3>'.&mt('Processing').
+ ' ...<br>');
$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',
@@ -312,7 +370,7 @@ ENDHEAD
'difficulty' => 'Degree of difficulty');
my %dynmeta=&dynamicmeta($uri);
$r->print(
-'</table><h4>Access and Usage Statistics</h4><table cellspacing=2 border=0>');
+'</table><h4>'.&mt('Access and Usage Statistics').'</h4><table cellspacing=2 border=0>');
foreach ('count') {
$r->print(
'<tr><td bgcolor="#AAAAAA">'.$items{$_}.'</td><td bgcolor="#CCCCCC">'.
@@ -341,7 +399,7 @@ $dynmeta{$cat}.'<font size="-1"><ul>'.jo
$r->print('</table>');
if ($uri=~/\.(problem|exam|quiz|assess|survey|form)\.meta$/) {
$r->print(
-'<h4>Assessment Statistical Data</h4><table cellspacing=2 border=0>');
+'<h4>'.&mt('Assessment Statistical Data').'</h4><table cellspacing=2 border=0>');
foreach ('stdno','avetries') {
$r->print(
'<tr><td bgcolor="#AAAAAA">'.$items{$_}.'</td><td bgcolor="#CCCCCC">'.
@@ -354,7 +412,7 @@ $dynmeta{$_}." </td></tr>\n");
}
$r->print('</table>');
}
- $r->print('<h4>Evaluation Data</h4><table cellspacing=2 border=0>');
+ $r->print('<h4>'.&mt('Evaluation Data').'</h4><table cellspacing=2 border=0>');
foreach ('clear','depth','helpful','correct','technical') {
$r->print(
'<tr><td bgcolor="#AAAAAA">'.$items{$_}.'</td><td bgcolor="#CCCCCC">'.
@@ -365,10 +423,11 @@ $dynmeta{$_}." </td></tr>\n");
if ((($ENV{'user.domain'} eq $1) && ($ENV{'user.name'} eq $2))
|| ($ENV{'user.role.ca./'.$1.'/'.$2})) {
$r->print(
- '<h4>Evaluation Comments (visible to author and co-authors only)</h4>'.
+ '<h4>'.&mt('Evaluation Comments').' ('.&mt('visible to author and co-authors only').')</h4>'.
'<blockquote>'.$dynmeta{'comments'}.'</blockquote>');
$r->print(
- '<h4>Error Messages (visible to author and co-authors only)</h4>');
+ '<h4>'.&mt('Error Messages').' ('.
+ &mt('visible to author and co-authors only').')</h4>');
my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$1,$2);
foreach (keys %errormsgs) {
if ($_=~/^\Q$disuri\E\_\d+$/) {
@@ -380,7 +439,7 @@ $dynmeta{$_}." </td></tr>\n");
}
# ------------------------------------------------------------- All other stuff
$r->print(
- '<h3>Additional Metadata (non-standard, parameters, exports)</h3>');
+ '<h3>'.&mt('Additional Metadata (non-standard, parameters, exports)').'</h3>');
foreach (sort keys %content) {
my $name=$_;
unless ($name=~/\.display$/) {
@@ -421,7 +480,8 @@ $dynmeta{$_}." </td></tr>\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=();
@@ -433,13 +493,15 @@ $bodytag
<form method="post">
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_'.$_};
}
if (m/copyright/) {
$r->print(&Apache::lonpublisher::selectbox($_,'new_'.$_,
- $Apache::lonpublisher::metadatafields{$_},
+ ($Apache::lonpublisher::metadatafields{$_}?
+ $Apache::lonpublisher::metadatafields{$_}:'default'),
\&Apache::loncommon::copyrightdescription,
(&Apache::loncommon::copyrightids)));
} elsif (m/language/) {
@@ -456,7 +518,8 @@ ENDEDIT
my $mfh;
unless ($mfh=Apache::File->new('>'.$fn)) {
$r->print(
- '<p><font color=red>Could not write metadata, FAIL</font>');
+ '<p><font color=red>'.&mt('Could not write metadata').', '.
+ &mt('FAIL').'</font>');
} else {
foreach (sort keys %Apache::lonpublisher::metadatafields) {
unless ($_=~/\./) {
@@ -477,11 +540,12 @@ ENDEDIT
.'</'.$tag.'>';
}
}
- $r->print('<p>Wrote Metadata');
+ $r->print('<p>'.&mt('Wrote Metadata'));
}
}
$r->print(
- '<br /><input type="submit" name="store" value="Store Catalog Information"></form></body></html>');
+ '<br /><input type="submit" name="store" value="'.
+&mt('Store Catalog Information').'"></form></body></html>');
return OK;
}
}