--- loncom/interface/lonmeta.pm 2003/09/22 00:48:32 1.35
+++ 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.35 2003/09/22 00:48:32 www Exp $
+# $Id: lonmeta.pm,v 1.43 2003/12/26 21:17:37 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,6 +40,7 @@ use Apache::loncommon();
use Apache::lonmsg;
use Apache::lonpublisher;
use Apache::lonlocal;
+use Apache::lonmysql;
# ----------------------------------------- Fetch and evaluate dynamic metadata
@@ -55,7 +56,7 @@ sub dynamicmeta {
my %sum=();
my %cnt=();
my %concat=();
- my %listitems=('count' => 'add',
+ my %listitems=(
'course' => 'add',
'goto' => 'add',
'comefrom' => 'add',
@@ -70,10 +71,10 @@ sub dynamicmeta {
'comments' => 'app',
'usage' => 'cnt'
);
- foreach (keys %evaldata) {
- my ($item,$purl,$cat)=&Apache::lonnet::decode_symb($_);
-### 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{$_};
@@ -93,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') {
@@ -102,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 {
@@ -219,10 +235,10 @@ sub handler {
# --------------------------------------------------------------- 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);
@@ -234,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;
}
@@ -244,18 +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');
+ 'cf' => 'Custom Distribution File',
+ 'ob' => 'Obsolete',
+ 'or' =>
+ 'Suggested Replacement for Obsolete File');
my $bodytag=&Apache::loncommon::bodytag
('Catalog Information','','','',$resdomain);
$r->print(<<ENDHEAD);
@@ -263,6 +293,7 @@ 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'>$lt{'au'}</td>
@@ -275,6 +306,12 @@ $versiondisplay<br />
<td bgcolor="#CCCCCC">$content{'notes'} </td></tr>
<tr><td bgcolor='#AAAAAA'>$lt{'ab'}</td>
<td bgcolor="#CCCCCC">$content{'abstract'} </td></tr>
+<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'>$lt{'la'}</td>
@@ -289,6 +326,10 @@ Last Revision Date</td><td bgcolor="#CCC
<td bgcolor="#CCCCCC">$content{'copyright'} </td></tr>
<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'});
@@ -304,6 +345,8 @@ ENDHEAD
delete($content{'owner'});
delete($content{'copyright'});
delete($content{'customdistributionfile'});
+ delete($content{'obsolete'});
+ delete($content{'obsoletereplacement'});
if ($ENV{'user.adv'}) {
# ------------------------------------------------------------ Dynamic Metadata
$r->print(
@@ -383,7 +426,8 @@ $dynmeta{$_}." </td></tr>\n");
'<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+$/) {
@@ -436,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=();
@@ -448,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/) {
@@ -471,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 ($_=~/\./) {
@@ -492,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;
}
}