--- loncom/interface/lonmeta.pm 2003/04/15 00:53:04 1.31
+++ loncom/interface/lonmeta.pm 2003/12/29 15:10:54 1.45
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.31 2003/04/15 00:53:04 www Exp $
+# $Id: lonmeta.pm,v 1.45 2003/12/29 15:10:54 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;
@@ -39,6 +34,12 @@ use Apache::lonnet();
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
@@ -54,7 +55,7 @@ sub dynamicmeta {
my %sum=();
my %cnt=();
my %concat=();
- my %listitems=('count' => 'add',
+ my %listitems=(
'course' => 'add',
'goto' => 'add',
'comefrom' => 'add',
@@ -69,10 +70,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 +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') {
@@ -101,11 +102,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 {
@@ -174,6 +190,54 @@ 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'
+ );
+}
# ================================================================ Main Handler
sub handler {
@@ -199,7 +263,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,106 +276,91 @@ 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 $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='Version: '.$thisversion.
- ' (most recent version: '.$currentversion.')';
-} else {
- $versiondisplay='Version: '.$currentversion;
-}
-my $customdistributionfile='';
-if ($content{'customdistributionfile'}) {
- $customdistributionfile='<a href="'.$content{'customdistributionfile'}.
- '"><tt>'.$content{'customdistributionfile'}.'</tt></a>';
-}
-my $bodytag=&Apache::loncommon::bodytag
+ my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/);
+ $content{'creationdate'}=&Apache::lonlocal::locallocaltime(
+ &Apache::lonmysql::unsqltime($content{'creationdate'}));
+ $content{'lastrevisiondate'}=&Apache::lonlocal::locallocaltime(
+ &Apache::lonmysql::unsqltime($content{'lastrevisiondate'}));
+ $content{'language'}=&Apache::loncommon::languagedescription($content{'language'});
+ $content{'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'};
+ $content{'author'}=~s/(\w+)(\:|\@)(\w+)/&authordisplay($1,$3)/gse;
+ $content{'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;
+ }
+ if ($content{'customdistributionfile'}) {
+ $content{'customdistributionfile'}='<a href="'.$content{'customdistributionfile'}.
+ '"><tt>'.$content{'customdistributionfile'}.'</tt></a>';
+ } else {
+ $content{'customdistributionfile'}='';
+ }
+ my $obsolete=$content{'obsolete'};
+ 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=&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.='<tr><td bgcolor="#AAAAAA">'.$lt{$_}.
+ '</td><td bgcolor="#CCCCCC">'.
+ $content{$_}.' </td></tr>';
+ delete $content{$_};
+ }
+
$r->print(<<ENDHEAD);
<html><head><title>Catalog Information</title></head>
$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>
-<td bgcolor="#CCCCCC">$author </td></tr>
-<tr><td bgcolor='#AAAAAA'>Subject</td>
-<td bgcolor="#CCCCCC">$content{'subject'} </td></tr>
-<tr><td bgcolor='#AAAAAA'>Keyword(s)</td>
-<td bgcolor="#CCCCCC">$content{'keywords'} </td></tr>
-<tr><td bgcolor='#AAAAAA'>Notes</td>
-<td bgcolor="#CCCCCC">$content{'notes'} </td></tr>
-<tr><td bgcolor='#AAAAAA'>Abstract</td>
-<td bgcolor="#CCCCCC">$content{'abstract'} </td></tr>
-<tr><td bgcolor='#AAAAAA'>MIME Type</td>
-<td bgcolor="#CCCCCC">$mime ($content{'mime'}) </td></tr>
-<tr><td bgcolor='#AAAAAA'>Language</td>
-<td bgcolor="#CCCCCC">$language </td></tr>
-<tr><td bgcolor='#AAAAAA'>Creation Date</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>
-<td bgcolor="#CCCCCC">$owner </td></tr>
-<tr><td bgcolor='#AAAAAA'>Copyright/Distribution</td>
-<td bgcolor="#CCCCCC">$content{'copyright'} </td></tr>
-<tr><td bgcolor='#AAAAAA'>Custom Distribution File</td>
-<td bgcolor="#CCCCCC">$customdistributionfile </td></tr>
+$table
</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'});
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=(
- '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(
-'</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">'.
@@ -340,7 +389,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">'.
@@ -353,7 +402,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">'.
@@ -364,10 +413,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+$/) {
@@ -379,23 +429,25 @@ $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=$_;
- 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('<b>'.$display.':</b> '.$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('<b>'.$display.':</b> '.$content{$name});
+ if ($otherinfo) {
+ $r->print(' ('.$otherinfo.')');
+ }
+ $r->print("<br>\n");
}
- $r->print("<br>\n");
}
}
# ===================================================== End Resource Space Call
@@ -404,7 +456,7 @@ $dynmeta{$_}." </td></tr>\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;
@@ -418,7 +470,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=();
@@ -429,20 +482,35 @@ $bodytag
<h1>$displayfile</h1>
<form method="post">
ENDEDIT
+ my %lt=&fieldnames();
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_'.$_};
}
- $r->print(
- &Apache::lonpublisher::textfield($_,'new_'.$_,
- $Apache::lonpublisher::metadatafields{$_}));
+ if (m/copyright/) {
+ $r->print(&Apache::lonpublisher::selectbox($lt{$_},'new_'.$_,
+ ($Apache::lonpublisher::metadatafields{$_}?
+ $Apache::lonpublisher::metadatafields{$_}:'default'),
+ \&Apache::loncommon::copyrightdescription,
+ (&Apache::loncommon::copyrightids)));
+ } elsif (m/language/) {
+ $r->print(&Apache::lonpublisher::selectbox($lt{$_},'new_'.$_,
+ $Apache::lonpublisher::metadatafields{$_},
+ \&Apache::loncommon::languagedescription,
+ (&Apache::loncommon::languageids)));
+ } else {
+ $r->print(&Apache::lonpublisher::textfield($lt{$_},'new_'.$_,
+ $Apache::lonpublisher::metadatafields{$_}));
+ }
}
if ($ENV{'form.store'}) {
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 ($_=~/\./) {
@@ -463,15 +531,21 @@ 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;
}
}
+# ================================================================= BEGIN Block
+BEGIN {
+# Get columns of MySQL metadata table
+ @columns=&Apache::lonmysql::col_order('metadata');
+}
1;
__END__