--- loncom/interface/lonmeta.pm 2005/12/05 20:30:16 1.134
+++ loncom/interface/lonmeta.pm 2005/12/08 02:17:56 1.135
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.134 2005/12/05 20:30:16 banghart Exp $
+# $Id: lonmeta.pm,v 1.135 2005/12/08 02:17:56 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -603,6 +603,10 @@ sub prettyinput {
",'rights')\">".&mt('Select').''.
&relatedfield(0,$relatedsearchflag,$relatedsep);
}
+ if ($type eq 'courserestricted') {
+ return ('');
+ }
+
# Dates
if (($type eq 'creationdate') ||
($type eq 'lastrevisiondate')) {
@@ -1097,7 +1101,7 @@ ENDEDIT
'default';
}
if ($metacourse ne 'none') {
- $r->print('Document metadata restricted by : '.$env{$metacourse.".description"}."
");
+ $r->print('Using: '.$env{$metacourse.".description"}." metadata framework
");
}
foreach my $field_name(@fields) {
@@ -1152,7 +1156,7 @@ ENDEDIT
$Apache::lonpublisher::metadatakeys{$unikey})
) {
my $value=
- $Apache::lonpublisher::metadatafields{$unikey.'.'.$_};
+ $Apache::lonpublisher::metadatafields{$unikey.'.'.$_};
$value=~s/\"/\'\'/g;
$file_content.=' '.$_.'="'.$value.'"' ;
# print $mfh ' '.$_.'="'.$value.'"';
@@ -1166,7 +1170,7 @@ ENDEDIT
if ($fn =~ /\/portfolio\//) {
$fn =~ /\/portfolio\/(.*)$/;
my $new_fn = '/'.$1;
- $env{'form.'.$formname}=$file_content;
+ $env{'form.'.$formname}=$file_content."\n";
$env{'form.'.$formname.'.filename'}=$new_fn;
&Apache::lonnet::userfileupload('uploaddoc','',
'portfolio'.$env{'form.currentpath'});
@@ -1192,8 +1196,14 @@ ENDEDIT
}
}
}
- $r->print($output.'
');
+ my $button_label;
+ if ($fn =~ /\/portfolio\//) {
+ $button_label = 'Store Metadata';
+ } else {
+ $button_label = 'Store Catalog Information';
+ }
+ $r->print($output.'
');
}
$r->print('');
return;