--- loncom/interface/lonmeta.pm 2003/12/29 15:10:54 1.45 +++ loncom/interface/lonmeta.pm 2003/12/30 20:39:30 1.50 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.45 2003/12/29 15:10:54 www Exp $ +# $Id: lonmeta.pm,v 1.50 2003/12/30 20:39:30 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,10 +32,12 @@ use strict; use Apache::Constants qw(:common); use Apache::lonnet(); use Apache::loncommon(); +use Apache::lonhtmlcommon(); use Apache::lonmsg; use Apache::lonpublisher; use Apache::lonlocal; use Apache::lonmysql; +use Apache::lonmsg; # MySQL table columns @@ -85,7 +87,7 @@ sub dynamicmeta { } else { if (defined($sum{$cat})) { if ($evaldata{$_}) { - $sum{$cat}.='
'.$evaldata{$_}; + $sum{$cat}.='
'.$evaldata{$_}; } } else { $sum{$cat}=''.$evaldata{$_}; @@ -105,8 +107,11 @@ sub dynamicmeta { ### Apache->request->print("\n
".$_.': '.$returnhash{$_}.'
'.$returnhash{$_.'_list'}); } # - # Deal with 'count' seperately + # Deal with 'count' separately $returnhash{'count'} = &access_count($url,$aauthor,$adomain); + # since "usage" is reserved word in MySQL ... + $returnhash{'sequsage'}=$returnhash{'usage'}; + $returnhash{'sequsage_list'}=$returnhash{'usage_list'}; return %returnhash; } @@ -116,7 +121,7 @@ sub access_count { my %countdata=&Apache::lonnet::dump('nohist_accesscount',$adomain, $author,$src); if (! exists($countdata{$src})) { - return 'Not Available'; + return &mt('Not Available'); } else { return $countdata{$src}; } @@ -136,7 +141,7 @@ sub alttag { $alttag=~s/\s+$//gs; $alttag=~s/^\s+//gs; if ($alttag) { return $alttag; } else - { return 'No information available'; } + { return &mt('No information available'); } } # -------------------------------------------------------------- Author display @@ -145,7 +150,7 @@ sub authordisplay { my ($aname,$adom)=@_; return &Apache::loncommon::aboutmewrapper( &Apache::loncommon::plainname($aname,$adom), - $aname,$adom).' ['.$aname.'@'.$adom.']'; + $aname,$adom,'preview').' ['.$aname.'@'.$adom.']'; } # -------------------------------------------------------------- Pretty display @@ -225,9 +230,13 @@ sub fieldnames { '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', + 'course_list' => 'Network-wide courses using resource', + 'sequsage' => 'Number of resources using or importing resource', + 'sequsage_list' => 'Resources using or importing resource', 'goto' => 'Number of resources that follow this resource in maps', + 'goto_list' => 'Resources that follow this resource in maps', 'comefrom' => 'Number of resources that lead up to this resource in maps', + 'comefrom_list' => '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', @@ -238,6 +247,155 @@ sub fieldnames { 'difficulty' => 'Degree of difficulty' ); } + +# =========================================== Pretty printing of metadata field + +sub prettyprint { + my ($type,$value)=@_; + unless (defined($value)) { return ' '; } +# Title + if ($type eq 'title') { + return ''.$value.''; + } +# Dates + if (($type eq 'creationdate') || + ($type eq 'lastrevisiondate')) { + return &Apache::lonlocal::locallocaltime( + &Apache::lonmysql::unsqltime($value)); + } +# Language + if ($type eq 'language') { + return &Apache::loncommon::languagedescription($value); + } +# Copyright + if ($type eq 'copyright') { + return &Apache::loncommon::copyrightdescription($value); + } +# MIME + if ($type eq 'mime') { + return ' '. + &Apache::loncommon::filedescription($value); + } +# Person + if (($type eq 'author') || + ($type eq 'owner') || + ($type eq 'modifyinguser') || + ($type eq 'authorspace')) { + $value=~s/(\w+)(\:|\@)(\w+)/&authordisplay($1,$3)/gse; + return $value; + } +# Gradelevel + if (($type eq 'lowestgradelevel') || + ($type eq 'highestgradelevel')) { + return &Apache::loncommon::gradeleveldescription($value); + } +# Only for advance users below + unless ($ENV{'user.adv'}) { return '- '.&mt('not displayed').' -' }; +# File + if (($type eq 'customdistributionfile') || + ($type eq 'obsoletereplacement') || + ($type eq 'goto_list') || + ($type eq 'comefrom_list') || + ($type eq 'sequsage_list')) { + return join('
',map { + &Apache::lonnet::gettitle($_).' ['. + &Apache::lonhtmlcommon::crumbs(&Apache::lonnet::clutter($_),'preview').']'; + } split(/\s*\,\s*/,$value)); + } +# Evaluations + if (($type eq 'clear') || + ($type eq 'depth') || + ($type eq 'helpful') || + ($type eq 'correct') || + ($type eq 'technical')) { + return &evalgraph($value); + } +# Difficulty + if ($type eq 'difficulty') { + return &diffgraph($value); + } +# List of courses + if ($type=~/\_list/) { + return join('
',map { + my %courseinfo=&Apache::lonnet::coursedescription($_); + ''. + $courseinfo{'description'}.''; + } split(/\s*\,\s*/,$value)); + } +# No pretty print found + return $value; +} +# ============================================== Pretty input of metadata field + +sub selectbox { + my ($name,$value,$functionref,@idlist)=@_; + my $selout=''; +} + + +sub prettyinput { + my ($type,$value,$fieldname,$formname)=@_; +# Language + if ($type eq 'language') { + return &selectbox($fieldname, + $value, + \&Apache::loncommon::languagedescription, + (&Apache::loncommon::languageids)); + } +# Copyright + if ($type eq 'copyright') { + return &selectbox($fieldname, + $value, + \&Apache::loncommon::copyrightdescription, + (&Apache::loncommon::copyrightids)); + } +# Gradelevels + if (($type eq 'lowestgradelevel') || + ($type eq 'highestgradelevel')) { + return &Apache::loncommon::select_level_form($value,$fieldname); + } +# Obsolete + if ($type eq 'obsolete') { + return ''; + } +# Obsolete replacement file + if ($type eq 'obsoletereplacement') { + return '".&mt('Select').''; + } +# Customdistribution file + if ($type eq 'customdistributionfile') { + return '".&mt('Select').''; + } +# Dates + if (($type eq 'creationdate') || + ($type eq 'lastrevisiondate')) { + return &Apache::lonhtmlcommon::date_setter($formname, + $fieldname,$value); + } +# No pretty input found + $value=~s/^\s+//gs; + $value=~s/\s+$//gs; + $value=~s/\s+/ /gs; + $value=~s/\"/\&quod\;/gs; + return ''; +} + # ================================================================ Main Handler sub handler { @@ -272,41 +430,23 @@ sub handler { foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) { $content{$_}=&Apache::lonnet::metadata($uri,$_); } -# ------------------------------------------------------------------ Hide stuff - - unless ($ENV{'user.adv'}) { - foreach ('keywords','notes','abstract','subject') { - $content{$_}='- '.&mt('not displayed').' -'; - } - } - # --------------------------------------------------------------- Render Output +# displayed url 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$//; + $uri=~s/\.meta$//; + my $disuri=&Apache::lonnet::clutter($uri); + $disuri=&Apache::lonhtmlcommon::crumbs($disuri); +# version 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.')'; + ' ('.&mt('most recent version').': '. + ($currentversion>0?$currentversion:&mt('information not available')).')'; } else { $versiondisplay='Version: '.$currentversion; } - if ($content{'customdistributionfile'}) { - $content{'customdistributionfile'}=''.$content{'customdistributionfile'}.''; - } else { - $content{'customdistributionfile'}=''; - } +# obsolete my $obsolete=$content{'obsolete'}; my $obsoletewarning=''; if (($obsolete) && ($ENV{'user.adv'})) { @@ -335,7 +475,7 @@ sub handler { 'obsoletereplacement') { $table.=''.$lt{$_}. ''. - $content{$_}.' '; + &prettyprint($_,$content{$_}).''; delete $content{$_}; } @@ -352,103 +492,72 @@ $table ENDHEAD if ($ENV{'user.adv'}) { # ------------------------------------------------------------ Dynamic Metadata - $r->print( - '

'.&mt('Dynamic Metadata').' ('. - &mt('updated periodically').')

'.&mt('Processing'). - ' ...
'); - $r->rflush(); - my %items=&fieldnames(); - my %dynmeta=&dynamicmeta($uri); - $r->print( -'

'.&mt('Access and Usage Statistics').'

'); - 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( -'

'.&mt('Assessment Statistical Data').'

'); - foreach ('stdno','avetries') { - $r->print( -'\n"); + '

'.&mt('Dynamic Metadata').' ('. + &mt('updated periodically').')

'.&mt('Processing'). + ' ...
'); + $r->rflush(); + my %items=&fieldnames(); + my %dynmeta=&dynamicmeta($uri); +# General Access and Usage Statistics + $r->print('

'.&mt('Access and Usage Statistics').'

'.$items{$_}.''. -$dynmeta{$_}." 
'); + foreach ('count', + 'sequsage','sequsage_list', + 'comefrom','comefrom_list', + 'goto','goto_list', + 'course','course_list') { + $r->print('\n"); } - foreach ('difficulty') { - $r->print( -'\n"); + $r->print('
'.$lt{$_}.''. + &prettyprint($dynmeta{$_})."
'.$items{$_}.''. -&diffgraph($dynmeta{$_})."
'); + if ($uri=~/\.(problem|exam|quiz|assess|survey|form)\.meta$/) { +# This is an assessment, print assessment data + $r->print( + '

'.&mt('Assessment Statistical Data').'

'); + foreach ('stdno','avetries','difficulty') { + $r->print('\n"); + } + $r->print('
'.$lt{$_}.''. + &prettyprint($dynmeta{$_})."
'); + } + $r->print('

'.&mt('Evaluation Data').'

'); + foreach ('clear','depth','helpful','correct','technical') { + $r->print('\n"); + } + $r->print('
'.$lt{$_}.''. + &prettyprint($dynmeta{$_})."
'); + $uri=~/^\/res\/(\w+)\/(\w+)\//; + if ((($ENV{'user.domain'} eq $1) && ($ENV{'user.name'} eq $2)) + || ($ENV{'user.role.ca./'.$1.'/'.$2})) { + $r->print('

'.&mt('Evaluation Comments').' ('. + &mt('visible to author and co-authors only').')

'. + '
'.$dynmeta{'comments'}.'
'); + $r->print('

'.&mt('Error Messages').' ('. + &mt('visible to author and co-authors only').')

'. + &Apache::lonmsg::retrieve_author_res_msg($2,$1,$uri)); } - $r->print(''); - } - $r->print('

'.&mt('Evaluation Data').'

'); - foreach ('clear','depth','helpful','correct','technical') { - $r->print( -'\n"); - } - $r->print('
'.$items{$_}.''. -&evalgraph($dynmeta{$_})."
'); - $disuri=~/^(\w+)\/(\w+)\//; - if ((($ENV{'user.domain'} eq $1) && ($ENV{'user.name'} eq $2)) - || ($ENV{'user.role.ca./'.$1.'/'.$2})) { - $r->print( - '

'.&mt('Evaluation Comments').' ('.&mt('visible to author and co-authors only').')

'. - '
'.$dynmeta{'comments'}.'
'); - $r->print( - '

'.&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+$/) { - my %content=&Apache::lonmsg::unpackagemsg($errormsgs{$_}); - $r->print(''.$content{'time'}.': '.$content{'message'}. - '
'); - } - } - } # ------------------------------------------------------------- All other stuff - $r->print( - '

'.&mt('Additional Metadata (non-standard, parameters, exports)').'

'); - foreach (sort keys %content) { - my $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( + '

'.&mt('Additional Metadata (non-standard, parameters, exports)').'

'); + foreach (sort keys %content) { + my $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"); } - } } # ===================================================== End Resource Space Call } else { @@ -480,30 +589,23 @@ $dynmeta{$_}." \n"); Edit Catalog Information $bodytag

$displayfile

-
+ ENDEDIT + $r->print(''); my %lt=&fieldnames(); foreach ('author','title','subject','keywords','abstract','notes', - 'copyright','customdistributionfile','language', + 'copyright','customdistributionfile','language','standards', + 'lowestgradelevel','highestgradelevel', 'obsolete','obsoletereplacement') { - if ($ENV{'form.new_'.$_}) { - $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_}; - } - 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{$_})); + $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_}; + unless ($Apache::lonpublisher::metadatafields{'copyright'}) { + $Apache::lonpublisher::metadatafields{'copyright'}='default'; } + $r->print('

'.$lt{$_}.': '.&prettyinput($_, + $Apache::lonpublisher::metadatafields{$_}, + 'new_'.$_,'defaultmeta').'

'); } if ($ENV{'form.store'}) { my $mfh;