--- loncom/interface/lonmeta.pm 2002/02/11 04:19:40 1.14 +++ loncom/interface/lonmeta.pm 2003/07/15 19:04:31 1.33 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.14 2002/02/11 04:19:40 harris41 Exp $ +# $Id: lonmeta.pm,v 1.33 2003/07/15 19:04:31 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -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,15 +46,18 @@ 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 %sum; - my %cnt; + my %evaldata=&Apache::lonnet::dump('nohist_resevaldata',$adomain, + $aauthor,$regexp); + my %sum=(); + my %cnt=(); + my %concat=(); my %listitems=('count' => 'add', 'course' => 'add', + 'goto' => 'add', + 'comefrom' => 'add', 'avetries' => 'avg', 'stdno' => 'add', 'difficulty' => 'avg', @@ -65,21 +70,24 @@ sub dynamicmeta { 'usage' => 'cnt' ); foreach (keys %evaldata) { - $_=~/___(\w+)$/; - if (defined($cnt{$1})) { $cnt{$1}++; } else { $cnt{$1}=1; } - unless ($listitems{$1} eq 'app') { - if (defined($sum{$1})) { - $sum{$1}+=$evaldata{$_}; + my ($item,$purl,$cat)=split(/\_\_\_/,$_); +### 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{$_}; + $concat{$cat}.=','.$item; } else { - $sum{$1}=$evaldata{$_}; + $sum{$cat}=$evaldata{$_}; + $concat{$cat}=$item; } } else { - if (defined($sum{$1})) { + if (defined($sum{$cat})) { if ($evaldata{$_}) { - $sum{$1}.='
'.$evaldata{$_}; + $sum{$cat}.='
'.$evaldata{$_}; } } else { - $sum{$1}=''.$evaldata{$_}; + $sum{$cat}=''.$evaldata{$_}; } } } @@ -92,10 +100,38 @@ sub dynamicmeta { } else { $returnhash{$_}=$sum{$_}; } + $returnhash{$_.'_list'}=$concat{$_}; +### print "\n
".$_.': '.$returnhash{$_}.'
'.$returnhash{$_.'_list'}; } 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'; } +} + +# -------------------------------------------------------------- Author display + +sub authordisplay { + my ($aname,$adom)=@_; + return &Apache::loncommon::aboutmewrapper( + &Apache::loncommon::plainname($aname,$adom), + $aname,$adom).' ['.$aname.'@'.$adom.']'; +} + # -------------------------------------------------------------- Pretty display sub evalgraph { @@ -142,6 +178,23 @@ sub diffgraph { 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 @@ -152,12 +205,9 @@ sub handler { return OK if $r->header_only; # ------------------------------------------------------------------- Read file - - my $uri=$r->uri; foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) { $content{$_}=&Apache::lonnet::metadata($uri,$_); } - # ------------------------------------------------------------------ Hide stuff unless ($ENV{'user.adv'}) { @@ -167,22 +217,43 @@ sub handler { } # --------------------------------------------------------------- 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 $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=''.$content{'customdistributionfile'}.''; +} +my $bodytag=&Apache::loncommon::bodytag + ('Catalog Information','','','',$resdomain); $r->print(<Catalog Information - -

Catalog Information

+$bodytag

$content{'title'}

$disuri

+$versiondisplay
- + @@ -200,9 +271,11 @@ my $disuri=&Apache::lonnet::declutter($u - + - + +
Author(s)$content{'author'} 
$author 
Subject $content{'subject'} 
Keyword(s)
Last Revision Date$lastrevisiondate 
Publisher/Owner$content{'owner'} 
$owner 
Copyright/Distribution$content{'copyright'} +$content{'copyright'} 
Custom Distribution File$customdistributionfile 
ENDHEAD delete($content{'title'}); @@ -217,13 +290,18 @@ ENDHEAD delete($content{'lastrevisiondate'}); delete($content{'owner'}); delete($content{'copyright'}); + delete($content{'customdistributionfile'}); 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', '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', @@ -235,11 +313,31 @@ ENDHEAD my %dynmeta=&dynamicmeta($uri); $r->print( '

Access and Usage Statistics

'); - foreach ('count','usage','course') { + foreach ('count') { $r->print( '\n"); } + foreach my $cat ('usage','comefrom','goto') { + $r->print( +'\n"); + } + foreach my $cat ('course') { + $r->print( +'\n"); + } $r->print('
'.$items{$_}.''. $dynmeta{$_}." 
'.$items{$cat}.''. +$dynmeta{$cat}.'
'.$items{$cat}.''. +$dynmeta{$cat}.'
'); if ($uri=~/\.(problem|exam|quiz|assess|survey|form)\.meta$/) { $r->print( @@ -268,31 +366,124 @@ $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( '

Additional Metadata (non-standard, parameters, exports)

'); 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.'.'.$_).'; '; - } + 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(''.$display.': '.$content{$name}); + if ($otherinfo) { + $r->print(' ('.$otherinfo.')'); + } + $r->print("
\n"); } - $r->print(''.$display.': '.$content{$name}); - if ($otherinfo) { - $r->print(' ('.$otherinfo.')'); - } - $r->print("
\n"); } } - $r->print(''); - return OK; +# ===================================================== End Resource Space Call + } else { +# ===================================================== Construction Space Call + +# ----------------------------------------------------------- Set document type + + $r->content_type('text/html'); + $r->send_http_header; + + return OK if $r->header_only; +# ---------------------------------------------------------------------- Header + my $bodytag=&Apache::loncommon::bodytag('Edit Catalog Information'); + my $disuri=$uri; + my $fn=&Apache::lonnet::filelocation('',$uri); + $disuri=~s/^\/\~\w+//; + $disuri=~s/\.meta$//; + my $displayfile='Catalog Information for '.$disuri; + if ($disuri=~/\/default$/) { + my $dir=$disuri; + $dir=~s/default$//; + $displayfile='Default Cataloging Information for Directory '.$dir; + } + %Apache::lonpublisher::metadatafields=(); + %Apache::lonpublisher::metadatakeys=(); + &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile($fn)); + $r->print(<Edit Catalog Information +$bodytag +

$displayfile

+
+ENDEDIT + foreach ('author','title','subject','keywords','abstract','notes', + 'copyright','customdistributionfile','language') { + if ($ENV{'form.new_'.$_}) { + $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_}; + } + if (m/copyright/) { + $r->print(&Apache::lonpublisher::selectbox($_,'new_'.$_, + $Apache::lonpublisher::metadatafields{$_}, + \&Apache::loncommon::copyrightdescription, + (&Apache::loncommon::copyrightids))); + } elsif (m/language/) { + $r->print(&Apache::lonpublisher::selectbox($_,'new_'.$_, + $Apache::lonpublisher::metadatafields{$_}, + \&Apache::loncommon::languagedescription, + (&Apache::loncommon::languageids))); + } else { + $r->print(&Apache::lonpublisher::textfield($_,'new_'.$_, + $Apache::lonpublisher::metadatafields{$_})); + } + } + if ($ENV{'form.store'}) { + my $mfh; + unless ($mfh=Apache::File->new('>'.$fn)) { + $r->print( + '

Could not write metadata, FAIL'); + } else { + foreach (sort keys %Apache::lonpublisher::metadatafields) { + unless ($_=~/\./) { + my $unikey=$_; + $unikey=~/^([A-Za-z]+)/; + my $tag=$1; + $tag=~tr/A-Z/a-z/; + print $mfh "\n\<$tag"; + foreach + (split(/\,/,$Apache::lonpublisher::metadatakeys{$unikey})) { + my $value= + $Apache::lonpublisher::metadatafields{$unikey.'.'.$_}; + $value=~s/\"/\'\'/g; + print $mfh ' '.$_.'="'.$value.'"'; + } + print $mfh '>'. + &HTML::Entities::encode($Apache::lonpublisher::metadatafields{$unikey}) + .''; + } + } + $r->print('

Wrote Metadata'); + } + } + $r->print( + '

'); + return OK; + } } 1;