--- loncom/interface/lonmeta.pm 2003/09/25 22:30:06 1.36
+++ loncom/interface/lonmeta.pm 2003/12/28 20:12:59 1.44
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.36 2003/09/25 22:30:06 www Exp $
+# $Id: lonmeta.pm,v 1.44 2003/12/28 20:12:59 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
@@ -55,7 +55,7 @@ sub dynamicmeta {
my %sum=();
my %cnt=();
my %concat=();
- my %listitems=('count' => 'add',
+ my %listitems=(
'course' => 'add',
'goto' => 'add',
'comefrom' => 'add',
@@ -70,10 +70,10 @@ sub dynamicmeta {
'comments' => 'app',
'usage' => 'cnt'
);
- foreach (keys %evaldata) {
- my ($item,$purl,$cat)=&Apache::lonnet::decode_symb($_);
-### print "\n".$_.' - '.$item.'
';
- if (defined($cnt{$cat})) { $cnt{$cat}++; } else { $cnt{$cat}=1; }
+ while ($_=each(%evaldata)) {
+ my ($item,$purl,$cat)=split(/___/,$_);
+ ### Apache->request->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{$_};
@@ -93,7 +93,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 +102,26 @@ sub dynamicmeta {
$returnhash{$_}=$sum{$_};
}
$returnhash{$_.'_list'}=$concat{$_};
-### print "\n
".$_.': '.$returnhash{$_}.'
'.$returnhash{$_.'_list'};
+ ### Apache->request->print("\n
".$_.': '.$returnhash{$_}.'
'.$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 {
@@ -175,6 +190,17 @@ 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;
+}
+
# ================================================================ Main Handler
sub handler {
@@ -219,10 +245,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 +260,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;
}
@@ -258,6 +284,9 @@ my %lt=&Apache::lonlocal::texthash(
'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',
@@ -287,6 +316,12 @@ $versiondisplay
$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'} |
@@ -401,7 +436,8 @@ $dynmeta{$_}."
\n");
''.&mt('Evaluation Comments').' ('.&mt('visible to author and co-authors only').')
'.
''.$dynmeta{'comments'}.'
');
$r->print(
- 'Error Messages (visible to author and co-authors only)
');
+ ''.&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+$/) {
@@ -454,7 +490,8 @@ $dynmeta{$_}." \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=();
@@ -466,13 +503,15 @@ $bodytag