--- loncom/interface/lonmeta.pm 2004/04/13 14:42:24 1.64 +++ loncom/interface/lonmeta.pm 2004/04/14 16:14:29 1.67 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.64 2004/04/13 14:42:24 matthew Exp $ +# $Id: lonmeta.pm,v 1.67 2004/04/14 16:14:29 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,9 +40,6 @@ use Apache::lonlocal; use Apache::lonmysql; use Apache::lonmsg; -# MySQL table columns - -my @columns; # Fetch and evaluate dynamic metadata sub dynamicmeta { @@ -60,6 +57,15 @@ sub dynamicmeta { # # Deal with 'count' separately $Data{'count'} = &access_count($url,$aauthor,$adomain); + # + # Debugging code I will probably need later + if (0) { + &Apache::lonnet::logthis('Dynamic Metadata'); + while(my($k,$v)=each(%Data)){ + &Apache::lonnet::logthis(' "'.$k.'"=>"'.$v.'"'); + } + &Apache::lonnet::logthis('-------------------'); + } return %Data; } @@ -104,7 +110,9 @@ sub authordisplay { # Pretty display sub evalgraph { my $value=shift; - unless ($value) { return ''; } + if (! $value) { + return ''; + } my $val=int($value*10.+0.5)-10; my $output=''; if ($val>=20) { @@ -126,7 +134,9 @@ sub evalgraph { sub diffgraph { my $value=shift; - unless ($value) { return ''; } + if (! $value) { + return ''; + } my $val=int(40.0*$value+0.5); my @colors=('#FF9933','#EEAA33','#DDBB33','#CCCC33', '#BBDD33','#CCCC33','#DDBB33','#EEAA33'); @@ -142,15 +152,6 @@ 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 { @@ -200,7 +201,9 @@ sub fieldnames { sub prettyprint { my ($type,$value)=@_; - unless (defined($value)) { return ' '; } + if (! defined($value)) { + return ' '; + } # Title if ($type eq 'title') { return ''.$value.''; @@ -239,7 +242,9 @@ sub prettyprint { return &Apache::loncommon::gradeleveldescription($value); } # Only for advance users below - unless ($ENV{'user.adv'}) { return '- '.&mt('not displayed').' -' }; + if (! $ENV{'user.adv'}) { + return '- '.&mt('not displayed').' -'; + } # File if (($type eq 'customdistributionfile') || ($type eq 'obsoletereplacement') || @@ -284,7 +289,9 @@ sub direct { sub selectbox { my ($name,$value,$functionref,@idlist)=@_; - unless (defined($functionref)) { $functionref=\&direct; } + if (! defined($functionref)) { + $functionref=\&direct; + } my $selout=''; - delete $content{$_}; - } - # - $r->print(<Catalog Information -$bodytag + } else { + $r->print(&mt('Not authorized')); + } + return; +} + +##################################################### +##################################################### +### ### +### Uneditable Metadata Display ### +### ### +##################################################### +##################################################### +sub present_uneditable_metadata { + my ($r,$uri) = @_; + # + my %content=(); + # Read file + foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) { + $content{$_}=&Apache::lonnet::metadata($uri,$_); + } + # Render Output + # displayed url + my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/); + $uri=~s/\.meta$//; + my $disuri=&Apache::lonnet::clutter($uri); + # version + my $currentversion=&Apache::lonnet::getversion($disuri); + my $versiondisplay=''; + if ($thisversion) { + $versiondisplay=&mt('Version').': '.$thisversion. + ' ('.&mt('most recent version').': '. + ($currentversion>0 ? + $currentversion : + &mt('information not available')).')'; + } else { + $versiondisplay='Version: '.$currentversion; + } + # crumbify displayed URL + $disuri=&Apache::lonhtmlcommon::crumbs($disuri); + # obsolete + my $obsolete=$content{'obsolete'}; + my $obsoletewarning=''; + if (($obsolete) && ($ENV{'user.adv'})) { + $obsoletewarning='

'. + &mt('This resource has been marked obsolete by the author(s)'). + '

'; + } + # + my %lt=&fieldnames(); + my $table=''; + foreach ('title', + 'author', + 'subject', + 'keywords', + 'notes', + 'abstract', + 'lowestgradelevel', + 'highestgradelevel', + 'standards', + 'mime', + 'language', + 'creationdate', + 'lastrevisiondate', + 'owner', + 'copyright', + 'customdistributionfile', + 'obsolete', + 'obsoletereplacement') { + $table.=''; + delete $content{$_}; + } + # + $r->print(<$content{'title'}

$disuri

$obsoletewarning @@ -491,210 +540,237 @@ $versiondisplay
$table
'.$lt{$_}. - ''. - &prettyprint($_,$content{$_}).'
'.$lt{$_}. + ''. + &prettyprint($_,$content{$_}).'
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); - # General Access and Usage Statistics - $r->print('

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

'. - ''); - foreach ('count', - 'sequsage','sequsage_list', - 'comefrom','comefrom_list', - 'goto','goto_list', - 'course','course_list') { - $r->print(''. - '\n"); - } - $r->print('
'.$lt{$_}.''. - &prettyprint($_,$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"); + if ($ENV{'user.adv'}) { + &print_dynamic_metadata($r,$uri); + } + return; +} + +sub print_dynamic_metadata { + my ($r,$uri) = @_; + # + my $description = 'Dynamic Metadata (updated periodically)'; + $r->print('

'.&mt($description).'

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

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

'. + '
'.$lt{$_}.''. - &prettyprint($_,$dynmeta{$_})."
'); + foreach ('count', + 'sequsage','sequsage_list', + 'comefrom','comefrom_list', + 'goto','goto_list', + 'course','course_list') { + $r->print(''. + '\n"); + } + $r->print('
'.$lt{$_}.''. + &prettyprint($_,$dynmeta{$_})."
'); + if ($uri=~/\.(problem|exam|quiz|assess|survey|form)$/) { + # 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($uri)); + } + # All other stuff + $r->print('

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

'); + foreach (sort(keys(%content))) { + my $name=$_; + if ($name!~/\.display$/) { + my $display=&Apache::lonnet::metadata($uri, + $name.'.display'); + if (! $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(''); - } - $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($uri)); - } - # 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(''.$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 { - # Construction Space Call - # Set document type - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - # - return OK if $r->header_only; - # Header - my $disuri=$uri; - my $fn=&Apache::lonnet::filelocation('',$uri); - $disuri=~s/^\/\~/\/priv\//; - $disuri=~s/\.meta$//; - my $target=$uri; - $target=~s/^\/\~/\/res\/$ENV{'request.role.domain'}\//; - $target=~s/\.meta$//; - my $bombs=&Apache::lonmsg::retrieve_author_res_msg($target); - if ($bombs) { - if ($ENV{'form.delmsg'}) { - if (&Apache::lonmsg::del_url_author_res_msg($target) eq 'ok') { - $bombs=&mt('Messages deleted.'); - } else { - $bombs=&mt('Error deleting messages'); - } + } + return; +} + +##################################################### +##################################################### +### ### +### Editable metadata display ### +### ### +##################################################### +##################################################### +sub present_editable_metadata { + my ($r,$uri) = @_; + # Construction Space Call + # Header + my $disuri=$uri; + my $fn=&Apache::lonnet::filelocation('',$uri); + $disuri=~s/^\/\~/\/priv\//; + $disuri=~s/\.meta$//; + my $target=$uri; + $target=~s/^\/\~/\/res\/$ENV{'request.role.domain'}\//; + $target=~s/\.meta$//; + my $bombs=&Apache::lonmsg::retrieve_author_res_msg($target); + if ($bombs) { + if ($ENV{'form.delmsg'}) { + if (&Apache::lonmsg::del_url_author_res_msg($target) eq 'ok') { + $bombs=&mt('Messages deleted.'); + } else { + $bombs=&mt('Error deleting messages'); } - my $bodytag=&Apache::loncommon::bodytag('Error Messages'); - my $del=&mt('Delete Messages'); - $r->print(<Edit Catalog Information -$bodytag + } + my $del=&mt('Delete Messages'); + $r->print(<$disuri

$bombs -
- - ENDBOMBS - } else { - my $displayfile='Catalog Information for '.$disuri; - if ($disuri=~/\/default$/) { - my $dir=$disuri; - $dir=~s/default$//; - $displayfile= - &mt('Default Cataloging Information for Directory').' '. - $dir; - } - my $bodytag= - &Apache::loncommon::bodytag('Edit Catalog Information'); - %Apache::lonpublisher::metadatafields=(); - %Apache::lonpublisher::metadatakeys=(); - &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile($fn)); - $r->print(<print(<Edit Catalog Information $bodytag

$displayfile

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

'); + $r->print(''); + my %lt=&fieldnames(); + foreach ('author','title','subject','keywords','abstract','notes', + 'copyright','customdistributionfile','language', + 'standards', + 'lowestgradelevel','highestgradelevel', + 'obsolete','obsoletereplacement') { + if (defined($ENV{'form.new_'.$_})) { + $Apache::lonpublisher::metadatafields{$_}= + $ENV{'form.new_'.$_}; + } + if (! $Apache::lonpublisher::metadatafields{'copyright'}) { + $Apache::lonpublisher::metadatafields{'copyright'}= + 'default'; } - if ($ENV{'form.store'}) { - my $mfh; - unless ($mfh=Apache::File->new('>'.$fn)) { - $r->print('

'. - &mt('Could not write metadata').', '. - &mt('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(/\,/, + $r->print('

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

'); + } + if ($ENV{'form.store'}) { + my $mfh; + if (! ($mfh=Apache::File->new('>'.$fn))) { + $r->print('

'. + &mt('Could not write metadata').', '. + &mt('FAIL').''); + } else { + foreach (sort keys %Apache::lonpublisher::metadatafields) { + next if ($_ =~ /\./); + 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},'<>&"'). - ''; - } + ) { + my $value= + $Apache::lonpublisher::metadatafields{$unikey.'.'.$_}; + $value=~s/\"/\'\'/g; + print $mfh ' '.$_.'="'.$value.'"'; } - $r->print('

'.&mt('Wrote Metadata')); + print $mfh '>'. + &HTML::Entities::encode + ($Apache::lonpublisher::metadatafields{$unikey}, + '<>&"'). + ''; } + $r->print('

'.&mt('Wrote Metadata')); } - $r->print('

'. - ''); } + $r->print('
'); } - return OK; + $r->print(''); + return; } -# BEGIN Block +############################################################## +############################################################## +# MySQL table columns + +my @columns; + BEGIN { # Get columns of MySQL metadata table @columns=&Apache::lonmysql::col_order('metadata'); } +# +# Turn MySQL row into hash +# This routine should be moved to lonmetadata +# a more generic place since it has nothing to do with metadata +sub metadata_col_to_hash { + my @cols=@_; + my %hash=(); + for (my $i=0; $i<=$#columns; $i++) { + $hash{$columns[$i]}=$cols[$i]; + } + return %hash; +} + + 1; __END__