--- loncom/interface/lonmeta.pm 2003/06/30 17:17:30 1.32
+++ loncom/interface/lonmeta.pm 2004/01/01 20:13:17 1.54
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.32 2003/06/30 17:17:30 albertel Exp $
+# $Id: lonmeta.pm,v 1.54 2004/01/01 20:13:17 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -24,12 +24,7 @@
# /home/httpd/html/adm/gpl.txt
#
# http://www.lon-capa.org/
-#
-# (TeX Content Handler
-#
-# 05/29/00,05/30,10/11 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,8 +32,16 @@ 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
+
+my @columns;
# ----------------------------------------- Fetch and evaluate dynamic metadata
@@ -54,7 +57,7 @@ sub dynamicmeta {
my %sum=();
my %cnt=();
my %concat=();
- my %listitems=('count' => 'add',
+ my %listitems=(
'course' => 'add',
'goto' => 'add',
'comefrom' => 'add',
@@ -69,10 +72,10 @@ sub dynamicmeta {
'comments' => 'app',
'usage' => 'cnt'
);
- foreach (keys %evaldata) {
- my ($item,$purl,$cat)=split(/\_\_\_/,$_);
-### print "\n".$_.' - '.$item.' ';
- if (defined($cnt{$cat})) { $cnt{$cat}++; } else { $cnt{$cat}=1; }
+ while ($_=each(%evaldata)) {
+ my ($item,$purl,$cat)=split(/___/,$_);
+ ### Apache->request->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{$_};
@@ -84,7 +87,7 @@ sub dynamicmeta {
} else {
if (defined($sum{$cat})) {
if ($evaldata{$_}) {
- $sum{$cat}.='
'.$evaldata{$_};
+ $sum{$cat}.=' '.$evaldata{$_};
}
} else {
$sum{$cat}=''.$evaldata{$_};
@@ -92,7 +95,7 @@ sub dynamicmeta {
}
}
my %returnhash=();
- foreach (keys %cnt) {
+ while ($_=each(%cnt)) {
if ($listitems{$_} eq 'avg') {
$returnhash{$_}=int(($sum{$_}/$cnt{$_})*100.0+0.5)/100.0;
} elsif ($listitems{$_} eq 'cnt') {
@@ -101,11 +104,29 @@ sub dynamicmeta {
$returnhash{$_}=$sum{$_};
}
$returnhash{$_.'_list'}=$concat{$_};
-### print "\n ".$_.': '.$returnhash{$_}.' '.$returnhash{$_.'_list'};
+ ### Apache->request->print("\n ".$_.': '.$returnhash{$_}.' '.$returnhash{$_.'_list'});
}
+ #
+ # 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;
}
+sub access_count {
+ my ($src,$author,$adomain) = @_;
+ my %countdata=&Apache::lonnet::dump('nohist_accesscount',$adomain,
+ $author,$src);
+ if (! exists($countdata{$src})) {
+ return &mt('Not Available');
+ } else {
+ return $countdata{$src};
+ }
+}
+
# ------------------------------------- Try to make an alt tag if there is none
sub alttag {
@@ -120,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
@@ -129,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
@@ -174,6 +195,231 @@ 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 {
+ return &Apache::lonlocal::texthash(
+ 'title' => 'Title',
+ 'author' =>'Author(s)',
+ 'subject' => 'Subject',
+ 'keywords' => 'Keyword(s)',
+ 'notes' => 'Notes',
+ 'abstract' => 'Abstract',
+ 'lowestgradelevel' => 'Lowest Grade Level',
+ 'highestgradelevel' => 'Highest Grade Level',
+ 'standards' => 'Standards',
+ 'mime' => 'MIME Type',
+ 'language' => 'Language',
+ 'creationdate' => 'Creation Date',
+ 'lastrevisiondate' => 'Last Revision Date',
+ 'owner' => 'Publisher/Owner',
+ 'copyright' => 'Copyright/Distribution',
+ 'customdistributionfile' => 'Custom Distribution File',
+ 'obsolete' => 'Obsolete',
+ 'obsoletereplacement' => 'Suggested Replacement for Obsolete File',
+ 'count' => 'Network-wide number of accesses (hits)',
+ 'course' => 'Network-wide number of courses using 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',
+ 'correct' => 'Material appears to be correct',
+ 'technical' => 'Resource is technically correct',
+ 'avetries' => 'Average number of tries till solved',
+ 'stdno' => 'Total number of students who have worked on this problem',
+ '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 {
+ my $url=&Apache::lonnet::clutter($_);
+ ''.&Apache::lonnet::gettitle($url).' '.
+ &Apache::lonhtmlcommon::crumbs($url,'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 direct {
+ return shift;
+}
+
+sub selectbox {
+ my ($name,$value,$functionref,@idlist)=@_;
+ unless (defined($functionref)) { $functionref=\&direct; }
+ my $selout='';
+ foreach (@idlist) {
+ $selout.=''.&{$functionref}($_).' ';
+ }
+ else {$selout.='>'.&{$functionref}($_).'';}
+ }
+ return $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,$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
sub handler {
@@ -199,7 +445,7 @@ sub handler {
# ----------------------------------------------------------- Set document type
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK if $r->header_only;
@@ -208,195 +454,138 @@ 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{$_}='- not displayed - ';
- }
- }
-
# --------------------------------------------------------------- Render Output
- 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
+# 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='';
+ my $bodytag=&Apache::loncommon::bodytag
('Catalog Information','','','',$resdomain);
+ foreach ('title',
+ 'author',
+ 'subject',
+ 'keywords',
+ 'notes',
+ 'abstract',
+ 'lowestgradelevel',
+ 'highestgradelevel',
+ 'standards',
+ 'mime',
+ 'language',
+ 'creationdate',
+ 'lastrevisiondate',
+ 'owner',
+ 'copyright',
+ 'customdistributionfile',
+ 'obsolete',
+ 'obsoletereplacement') {
+ $table.=''.$lt{$_}.
+ ' '.
+ &prettyprint($_,$content{$_}).' ';
+ delete $content{$_};
+ }
+
$r->print(<Catalog Information
$bodytag
$content{'title'}
$disuri
+$obsoletewarning
$versiondisplay
-Author(s)
-$author
-Subject
-$content{'subject'}
-Keyword(s)
-$content{'keywords'}
-Notes
-$content{'notes'}
-Abstract
-$content{'abstract'}
-MIME Type
-$mime ($content{'mime'})
-Language
-$language
-Creation Date
-$creationdate
-
-Last Revision Date $lastrevisiondate
-Publisher/Owner
-$owner
-Copyright/Distribution
-$content{'copyright'}
-Custom Distribution File
-$customdistributionfile
+$table
ENDHEAD
- delete($content{'title'});
- delete($content{'author'});
- delete($content{'subject'});
- delete($content{'keywords'});
- delete($content{'notes'});
- delete($content{'abstract'});
- delete($content{'mime'});
- delete($content{'language'});
- delete($content{'creationdate'});
- delete($content{'lastrevisiondate'});
- delete($content{'owner'});
- delete($content{'copyright'});
if ($ENV{'user.adv'}) {
# ------------------------------------------------------------ Dynamic Metadata
- $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',
- 'correct' => 'Material appears to be correct',
- 'technical' => 'Resource is technically correct',
- 'avetries' => 'Average number of tries till solved',
- 'stdno' => 'Total number of students who have worked on this problem',
- 'difficulty' => 'Degree of difficulty');
- my %dynmeta=&dynamicmeta($uri);
- $r->print(
-'Access and Usage Statistics ');
- foreach ('count') {
- $r->print(
-''.$items{$_}.' '.
-$dynmeta{$_}." \n");
- }
- foreach my $cat ('usage','comefrom','goto') {
- $r->print(
-''.$items{$cat}.' '.
-$dynmeta{$cat}.' \n");
- }
- foreach my $cat ('course') {
- $r->print(
-''.$items{$cat}.' '.
-$dynmeta{$cat}.' \n");
- }
- $r->print('
');
- if ($uri=~/\.(problem|exam|quiz|assess|survey|form)\.meta$/) {
$r->print(
-'Assessment Statistical Data ');
- foreach ('stdno','avetries') {
- $r->print(
-''.$items{$_}.' '.
-$dynmeta{$_}." \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').' ');
+ foreach ('count',
+ 'sequsage','sequsage_list',
+ 'comefrom','comefrom_list',
+ 'goto','goto_list',
+ 'course','course_list') {
+ $r->print(''.$lt{$_}.' '.
+ &prettyprint($dynmeta{$_})." \n");
}
- foreach ('difficulty') {
- $r->print(
-''.$items{$_}.' '.
-&diffgraph($dynmeta{$_})." \n");
+ $r->print('
');
+ 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(''.$lt{$_}.' '.
+ &prettyprint($dynmeta{$_})." \n");
+ }
+ $r->print('
');
}
- $r->print('
');
- }
- $r->print('Evaluation Data ');
- foreach ('clear','depth','helpful','correct','technical') {
- $r->print(
-''.$items{$_}.' '.
-&evalgraph($dynmeta{$_})." \n");
- }
- $r->print('
');
- $disuri=~/^(\w+)\/(\w+)\//;
- if ((($ENV{'user.domain'} eq $1) && ($ENV{'user.name'} eq $2))
- || ($ENV{'user.role.ca./'.$1.'/'.$2})) {
- $r->print(
- 'Evaluation Comments (visible to author and co-authors only) '.
- ''.$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.'.'.$_).'; ';
- }
+ $r->print(''.&mt('Evaluation Data').' ');
+ foreach ('clear','depth','helpful','correct','technical') {
+ $r->print(''.$lt{$_}.' '.
+ &prettyprint($dynmeta{$_})." \n");
+ }
+ $r->print('
');
+ $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(''.$display.': '.$content{$name});
- if ($otherinfo) {
- $r->print(' ('.$otherinfo.')');
+# ------------------------------------------------------------- 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(" \n");
- }
}
# ===================================================== End Resource Space Call
} else {
@@ -404,85 +593,116 @@ $dynmeta{$_}." \n");
# ----------------------------------------------------------- Set document type
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'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/^\/\~/\/priv\//;
$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(<print(<Edit Catalog Information
+$bodytag
+$disuri
+
+