--- loncom/interface/lonmeta.pm 2003/12/29 17:11:53 1.46 +++ loncom/interface/lonmeta.pm 2004/04/06 15:07:41 1.62 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.46 2003/12/29 17:11:53 www Exp $ +# $Id: lonmeta.pm,v 1.62 2004/04/06 15:07:41 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,6 +37,7 @@ use Apache::lonmsg; use Apache::lonpublisher; use Apache::lonlocal; use Apache::lonmysql; +use Apache::lonmsg; # MySQL table columns @@ -108,6 +109,9 @@ sub dynamicmeta { # # 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; } @@ -117,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}; } @@ -137,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 @@ -208,6 +212,8 @@ sub fieldnames { return &Apache::lonlocal::texthash( 'title' => 'Title', 'author' =>'Author(s)', + 'authorspace' => 'Author Space', + 'modifyinguser' => 'Last Modifying User', 'subject' => 'Subject', 'keywords' => 'Keyword(s)', 'notes' => 'Notes', @@ -226,9 +232,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', @@ -252,8 +262,9 @@ sub prettyprint { # Dates if (($type eq 'creationdate') || ($type eq 'lastrevisiondate')) { - return &Apache::lonlocal::locallocaltime( - &Apache::lonmysql::unsqltime($value)); + return ($value?&Apache::lonlocal::locallocaltime( + &Apache::lonmysql::unsqltime($value)): + &mt('not available')); } # Language if ($type eq 'language') { @@ -276,6 +287,13 @@ sub prettyprint { $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') || @@ -283,8 +301,9 @@ sub prettyprint { ($type eq 'comefrom_list') || ($type eq 'sequsage_list')) { return join('
',map { - &Apache::lonnet::gettitle($_).' ['. - &Apache::lonhtmlcommon::crumbs(&Apache::lonnet::clutter($_),'preview').']'; + my $url=&Apache::lonnet::clutter($_); + ''.&Apache::lonnet::gettitle($url).''. + &Apache::lonhtmlcommon::crumbs($url,'preview','',undef,'+0'); } split(/\s*\,\s*/,$value)); } # Evaluations @@ -313,8 +332,95 @@ sub prettyprint { } # ============================================== Pretty input of metadata field +sub direct { + return shift; +} + +sub selectbox { + my ($name,$value,$functionref,@idlist)=@_; + unless (defined($functionref)) { $functionref=\&direct; } + my $selout=''; +} + +sub relatedfield { + my ($show,$relatedsearchflag,$relatedsep,$fieldname,$relatedvalue)=@_; + unless ($relatedsearchflag) { return ''; } + unless (defined($relatedsep)) { $relatedsep=' '; } + unless ($show) { return $relatedsep.' '; } + return $relatedsep.''; +} + sub prettyinput { - my ($type,$value,$fieldname)=@_; + my ($type,$value,$fieldname,$formname, + $relatedsearchflag,$relatedsep,$relatedvalue)=@_; +# Language + if ($type eq 'language') { + return &selectbox($fieldname, + $value, + \&Apache::loncommon::languagedescription, + (&Apache::loncommon::languageids)). + &relatedfield(0,$relatedsearchflag,$relatedsep); + } +# Copyright + if ($type eq 'copyright') { + return &selectbox($fieldname, + $value, + \&Apache::loncommon::copyrightdescription, + (&Apache::loncommon::copyrightids)). + &relatedfield(0,$relatedsearchflag,$relatedsep); + } +# Gradelevels + if (($type eq 'lowestgradelevel') || + ($type eq 'highestgradelevel')) { + return &Apache::loncommon::select_level_form($value,$fieldname). + &relatedfield(0,$relatedsearchflag,$relatedsep); + } +# Obsolete + if ($type eq 'obsolete') { + return ''. + &relatedfield(0,$relatedsearchflag,$relatedsep); + } +# Obsolete replacement file + if ($type eq 'obsoletereplacement') { + return '".&mt('Select').''. + &relatedfield(0,$relatedsearchflag,$relatedsep); + } +# Customdistribution file + if ($type eq 'customdistributionfile') { + return '".&mt('Select').''. + &relatedfield(0,$relatedsearchflag,$relatedsep); + } +# Dates + if (($type eq 'creationdate') || + ($type eq 'lastrevisiondate')) { + return &Apache::lonhtmlcommon::date_setter($formname, + $fieldname,$value). + &relatedfield(0,$relatedsearchflag,$relatedsep); + } +# No pretty input found + $value=~s/^\s+//gs; + $value=~s/\s+$//gs; + $value=~s/\s+/ /gs; + $value=~s/\"/\&quod\;/gs; + return + ''. + &relatedfield(1,$relatedsearchflag,$relatedsep,$fieldname,$relatedvalue); } # ================================================================ Main Handler @@ -328,7 +434,30 @@ sub handler { my $uri=$r->uri; - unless ($uri=~/^\/\~/) { +# ====================================================== Looking for all bombs? + if ($uri=~/\/adm\/bombs\/(.*)$/) { +# ----------------------------------------------------------- Set document type + $uri=&Apache::lonnet::declutter($1); + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + + return OK if $r->header_only; + $r->print(&Apache::loncommon::bodytag('Error Messages')); + $r->print('

'.&Apache::lonnet::clutter($uri).'

'); + my ($domain,$author)=($uri=~/^(\w+)\/(\w+)\//); + if (&Apache::loncacc::constructaccess('/~'.$author.'/',$domain)) { + my %brokenurls=&Apache::lonmsg::all_url_author_res_msg($author,$domain); + foreach (sort keys %brokenurls) { + if ($_=~/^\Q$uri\E/) { + $r->print(&Apache::lonhtmlcommon::crumbs(&Apache::lonnet::clutter($_)). + &Apache::lonmsg::retrieve_author_res_msg($_).'
'); + } + } + } else { + $r->print(&mt('Not authorized')); + } + $r->print(''); + } elsif ($uri!~/^\/\~/) { # =========================================== This is not in construction space my ($resdomain,$resuser)= (&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//); @@ -351,29 +480,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$/); + $uri=~s/\.meta$//; my $disuri=&Apache::lonnet::clutter($uri); - $disuri=~s/\.meta$//; - $disuri=&Apache::lonhtmlcommon::crumbs($disuri); # version my $currentversion=&Apache::lonnet::getversion($disuri); 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; } +# crumbify displayed URL + $disuri=&Apache::lonhtmlcommon::crumbs($disuri); # obsolete my $obsolete=$content{'obsolete'}; my $obsoletewarning=''; @@ -391,7 +514,10 @@ sub handler { 'subject', 'keywords', 'notes', - 'abstract', + 'abstract', + 'lowestgradelevel', + 'highestgradelevel', + 'standards', 'mime', 'language', 'creationdate', @@ -420,103 +546,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($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 { @@ -529,84 +624,106 @@ $dynmeta{$_}." \n"); 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/^\/\~/\/priv\//; $disuri=~s/\.meta$//; - my $displayfile='Catalog Information for '.$disuri; - if ($disuri=~/\/default$/) { - my $dir=$disuri; - $dir=~s/default$//; - $displayfile=&mt('Default Cataloging Information for Directory').' '. - $dir; - } - %Apache::lonpublisher::metadatafields=(); - %Apache::lonpublisher::metadatakeys=(); - &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile($fn)); - $r->print(<print(<Edit Catalog Information +$bodytag +

$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(<Edit Catalog Information $bodytag

$displayfile

-
+ ENDEDIT - my %lt=&fieldnames(); - foreach ('author','title','subject','keywords','abstract','notes', - 'copyright','customdistributionfile','language', - '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{$_})); - } - } - 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(/\,/,$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(''); + 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_'.$_}; } - $r->print('

'.&mt('Wrote Metadata')); + unless ($Apache::lonpublisher::metadatafields{'copyright'}) { + $Apache::lonpublisher::metadatafields{'copyright'}='default'; + } + $r->print('

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

'); } - } - $r->print( - '
'); - return OK; + 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(/\,/,$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('

'.&mt('Wrote Metadata')); + } + } + $r->print( + '
'); + } } + return OK; } # ================================================================= BEGIN Block