--- loncom/interface/lonmeta.pm 2005/03/17 21:32:17 1.94
+++ loncom/interface/lonmeta.pm 2005/05/09 01:51:44 1.97
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.94 2005/03/17 21:32:17 banghart Exp $
+# $Id: lonmeta.pm,v 1.97 2005/05/09 01:51:44 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,7 +31,7 @@ package Apache::lonmeta;
use strict;
use LONCAPA::lonmetadata();
use Apache::Constants qw(:common);
-use Apache::lonnet();
+use Apache::lonnet;
use Apache::loncommon();
use Apache::lonhtmlcommon();
use Apache::lonmsg;
@@ -338,7 +338,7 @@ sub prettyprint {
return &Apache::loncommon::gradeleveldescription($value);
}
# Only for advance users below
- if (! $ENV{'user.adv'}) {
+ if (! $env{'user.adv'}) {
return '- '.&mt('not displayed').' -';
}
# File
@@ -632,7 +632,7 @@ sub present_uneditable_metadata {
# obsolete
my $obsolete=$content{'obsolete'};
my $obsoletewarning='';
- if (($obsolete) && ($ENV{'user.adv'})) {
+ if (($obsolete) && ($env{'user.adv'})) {
$obsoletewarning='
'.
&mt('This resource has been marked obsolete by the author(s)').
'
';
@@ -681,7 +681,7 @@ $versiondisplay
$table
ENDHEAD
- if ($ENV{'user.adv'}) {
+ if ($env{'user.adv'}) {
&print_dynamic_metadata($r,$uri,\%content);
}
return;
@@ -822,8 +822,8 @@ sub print_dynamic_metadata {
$r->print(''.&mt('No Evaluation Data is available for this resource.').'
');
}
$uri=~/^\/res\/(\w+)\/(\w+)\//;
- if ((($ENV{'user.domain'} eq $1) && ($ENV{'user.name'} eq $2))
- || ($ENV{'user.role.ca./'.$1.'/'.$2})) {
+ if ((($env{'user.domain'} eq $1) && ($env{'user.name'} eq $2))
+ || ($env{'user.role.ca./'.$1.'/'.$2})) {
if (exists($dynmeta{'comments'})) {
$r->print(''.&mt('Evaluation Comments').' ('.
&mt('visible to author and co-authors only').
@@ -890,11 +890,11 @@ sub present_editable_metadata {
$disuri=~s/^\/\~/\/priv\//;
$disuri=~s/\.meta$//;
my $target=$uri;
- $target=~s/^\/\~/\/res\/$ENV{'request.role.domain'}\//;
+ $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 ($env{'form.delmsg'}) {
if (&Apache::lonmsg::del_url_author_res_msg($target) eq 'ok') {
$bombs=&mt('Messages deleted.');
} else {
@@ -921,8 +921,7 @@ ENDBOMBS
%Apache::lonpublisher::metadatakeys=();
my $result=&Apache::lonnet::getfile($fn);
if ($result == -1){
- $r->print('Unable to get '.$fn);
- return ;
+ $r->print('Creating new '.$fn);
} else {
&Apache::lonpublisher::metaeval($result);
}
@@ -947,9 +946,9 @@ ENDEDIT
'obsolete','obsoletereplacement');
}
foreach (@fields) {
- if (defined($ENV{'form.new_'.$_})) {
+ if (defined($env{'form.new_'.$_})) {
$Apache::lonpublisher::metadatafields{$_}=
- $ENV{'form.new_'.$_};
+ $env{'form.new_'.$_};
}
if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
$Apache::lonpublisher::metadatafields{'copyright'}=
@@ -960,7 +959,7 @@ ENDEDIT
$Apache::lonpublisher::metadatafields{$_},
'new_'.$_,'defaultmeta').'');
}
- if ($ENV{'form.store'}) {
+ if ($env{'form.store'}) {
my $mfh;
my $formname='store';
my $file_content;
@@ -989,10 +988,10 @@ ENDEDIT
if ($fn =~ /\/portfolio\//) {
$fn =~ /\/portfolio\/(.*)$/;
my $new_fn = '/'.$1;
- $ENV{'form.'.$formname}=$file_content;
- $ENV{'form.'.$formname.'.filename'}=$new_fn;
+ $env{'form.'.$formname}=$file_content;
+ $env{'form.'.$formname.'.filename'}=$new_fn;
&Apache::lonnet::userfileupload('uploaddoc','',
- 'portfolio'.$ENV{'form.currentpath'});
+ 'portfolio'.$env{'form.currentpath'});
my $status =&Apache::lonnet::userfileupload($formname,'','portfolio');
if (&Apache::lonnet::userfileupload($formname,'','portfolio') eq 'error: no uploaded file') {
$r->print('
'.
@@ -1010,6 +1009,9 @@ ENDEDIT
&mt('FAIL').'
');
} else {
print $mfh $file_content;
+ $r->print(''.&mt('Wrote Metadata').
+ ' '.&Apache::lonlocal::locallocaltime(time).
+ '
');
}
}
}
@@ -1022,3 +1024,5 @@ ENDEDIT
1;
__END__
+
+
\ No newline at end of file