--- loncom/interface/lonmeta.pm 2001/12/24 21:09:08 1.11
+++ loncom/interface/lonmeta.pm 2003/03/14 19:29:36 1.28
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.11 2001/12/24 21:09:08 www Exp $
+# $Id: lonmeta.pm,v 1.28 2003/03/14 19:29:36 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -29,7 +29,7 @@
#
# 05/29/00,05/30,10/11 Gerd Kortemeyer)
#
-# 10/19,10/21,10/23,11/27,08/09/01,12/22,12/24 Gerd Kortemeyer
+# 10/19,10/21,10/23,11/27,08/09/01,12/22,12/24,12/25 Gerd Kortemeyer
package Apache::lonmeta;
@@ -37,6 +37,8 @@ use strict;
use Apache::Constants qw(:common);
use Apache::lonnet();
use Apache::loncommon();
+use Apache::lonmsg;
+use Apache::lonpublisher;
# ----------------------------------------- Fetch and evaluate dynamic metadata
@@ -44,11 +46,11 @@ sub dynamicmeta {
my $url=&Apache::lonnet::declutter(shift);
$url=~s/\.meta$//;
my ($adomain,$aauthor)=($url=~/^(\w+)\/(\w+)\//);
- my $regexp=&Apache::lonnet::escape($url);
+ my $regexp=$url;
$regexp=~s/(\W)/\\$1/g;
$regexp='___'.$regexp.'___';
- my %evaldata=&Apache::lonnet::dump
- ('resevaldata',$adomain,$aauthor,$regexp);
+ my %evaldata=&Apache::lonnet::dump('nohist_resevaldata',$adomain,
+ $aauthor,$regexp);
my %sum;
my %cnt;
my %listitems=('count' => 'add',
@@ -96,10 +98,86 @@ sub dynamicmeta {
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'; }
+}
+
+# -------------------------------------------------------------- Pretty display
+
+sub evalgraph {
+ my $value=shift;
+ unless ($value) { return ''; }
+ my $val=int($value*10.+0.5)-10;
+ my $output='
';
+ if ($val>=20) {
+ $output.='  | ';
+ } else {
+ $output.=' | '.
+ ' | ';
+ }
+ $output.=' | ';
+ if ($val>20) {
+ $output.=' | '.
+ ' | ';
+ } else {
+ $output.='  | ';
+ }
+ $output.=' ('.$value.') |
';
+ return $output;
+}
+
+sub diffgraph {
+ my $value=shift;
+ unless ($value) { return ''; }
+ my $val=int(40.0*$value+0.5);
+ my @colors=('#FF9933','#EEAA33','#DDBB33','#CCCC33',
+ '#BBDD33','#CCCC33','#DDBB33','#EEAA33');
+ my $output='';
+ for (my $i=0;$i<8;$i++) {
+ if ($val>$i*5) {
+ $output.=' | ';
+ } else {
+ $output.=' | ';
+ }
+ }
+ $output.=' ('.$value.') |
';
+ return $output;
+}
+
# ================================================================ Main Handler
sub handler {
my $r=shift;
+
+ my $loaderror=&Apache::lonnet::overloaderror($r);
+ if ($loaderror) { return $loaderror; }
+
+
+ my $uri=$r->uri;
+
+ unless ($uri=~/^\/\~/) {
+# =========================================== This is not in construction space
+ my ($resdomain,$resuser)=
+ (&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//);
+
+ $loaderror=
+ &Apache::lonnet::overloaderror($r,
+ &Apache::lonnet::homeserver($resuser,$resdomain));
+ if ($loaderror) { return $loaderror; }
+
my %content=();
# ----------------------------------------------------------- Set document type
@@ -110,34 +188,43 @@ sub handler {
return OK if $r->header_only;
# ------------------------------------------------------------------- Read file
-
- my $uri=$r->uri;
- map {
+ foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) {
$content{$_}=&Apache::lonnet::metadata($uri,$_);
- } split(/\,/,&Apache::lonnet::metadata($uri,'keys'));
-
+ }
# ------------------------------------------------------------------ Hide stuff
unless ($ENV{'user.adv'}) {
- map {
+ foreach ('keywords','notes','abstract','subject') {
$content{$_}='- not displayed -';
- } ('keywords','notes','abstract','subject');
+ }
}
# --------------------------------------------------------------- Render Output
-
-my $creationdate=localtime($content{'creationdate'});
-my $lastrevisiondate=localtime($content{'lastrevisiondate'});
+ 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 $versiondisplay='';
+if ($thisversion) {
+ $versiondisplay='Version: '.$thisversion.
+ ' (most recent version: '.$currentversion.')';
+} else {
+ $versiondisplay='Version: '.$currentversion;
+}
+my $bodytag=&Apache::loncommon::bodytag
+ ('Catalog Information','','','',$resdomain);
$r->print(<Catalog Information
-
-Catalog Information
+$bodytag
$content{'title'}
$disuri
+$versiondisplay
Author(s) |
$content{'author'} |
@@ -177,7 +264,9 @@ ENDHEAD
delete($content{'copyright'});
if ($ENV{'user.adv'}) {
# ------------------------------------------------------------ Dynamic Metadata
- $r->print('Dynamic Metadata (updated periodically)
');
+ $r->print(
+ 'Dynamic Metadata (updated periodically)
Processing ...
');
+ $r->rflush();
my %items=(
'count' => 'Network-wide number of accesses (hits)',
'course' => 'Network-wide number of courses using resource',
@@ -202,18 +291,23 @@ $dynmeta{$_}." \n");
if ($uri=~/\.(problem|exam|quiz|assess|survey|form)\.meta$/) {
$r->print(
'Assessment Statistical Data
');
- foreach ('stdno','avetries','difficulty') {
+ foreach ('stdno','avetries') {
$r->print(
''.$items{$_}.' | '.
$dynmeta{$_}." |
\n");
}
+ foreach ('difficulty') {
+ $r->print(
+''.$items{$_}.' | '.
+&diffgraph($dynmeta{$_})." |
\n");
+ }
$r->print('
');
}
$r->print('Evaluation Data
');
foreach ('clear','depth','helpful','correct','technical') {
$r->print(
''.$items{$_}.' | '.
-$dynmeta{$_}." |
\n");
+&evalgraph($dynmeta{$_})."\n");
}
$r->print('
');
$disuri=~/^(\w+)\/(\w+)\//;
@@ -221,7 +315,17 @@ $dynmeta{$_}." \n");
|| ($ENV{'user.role.ca./'.$1.'/'.$2})) {
$r->print(
'Evaluation Comments (visible to author and co-authors only)
'.
- ''.$dynmeta{'comments'}.'
');
+ ''.$dynmeta{'comments'}.'
');
+ $r->print(
+ 'Error Messages (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(
@@ -231,12 +335,12 @@ $dynmeta{$_}." \n");
my $display=&Apache::lonnet::metadata($uri,$name.'.display');
unless ($display) { $display=$name; };
my $otherinfo='';
- map {
+ foreach ('name','part','type','default') {
if (defined(&Apache::lonnet::metadata($uri,$name.'.'.$_))) {
$otherinfo.=' '.$_.'='.
&Apache::lonnet::metadata($uri,$name.'.'.$_).'; ';
}
- } ('name','part','type','default');
+ }
$r->print(''.$display.': '.$content{$name});
if ($otherinfo) {
$r->print(' ('.$otherinfo.')');
@@ -244,8 +348,78 @@ $dynmeta{$_}." \n");
$r->print("
\n");
}
}
- $r->print('