--- loncom/interface/lonmeta.pm 2005/10/06 22:16:32 1.109
+++ loncom/interface/lonmeta.pm 2005/10/25 18:46:03 1.117
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.109 2005/10/06 22:16:32 albertel Exp $
+# $Id: lonmeta.pm,v 1.117 2005/10/25 18:46:03 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -290,30 +290,36 @@ sub fieldnames {
sub select_course {
my ($r)=@_;
- $r->print('<h3>Instructor Selected Meta-Data</h3><br />');
+ my %courses;
+ foreach my $key (keys (%env)) {
+ if ($key =~ m/\.metadata\./) {
+ $key =~ m/^course\.(.+)(\.metadata.+$)/;
+ my $course = $1;
+ my $coursekey = 'course.'.$course.'.description';
+ my $value = $env{$coursekey};
+ $courses{$coursekey} = $value;
+ }
+ }
+ $r->print('<h3>Course Related Meta-Data</h3><br />');
$r->print('<form action="" method="post">');
- $r->print('Select your course<br />');
+ $r->print('Select your test course<br />');
$r->print('<select name="metacourse" >');
my $meta_not_found = 1;
- foreach my $key (keys %env) {
- if ($key =~ /\.metadata\./) {
- if ($meta_not_found) {
- undef($meta_not_found);
- $r->print('<h3>Instructor Selected Meta-Data</h3><br />');
- $r->print('<form action="" method="post">');
- $r->print('Select your course<br />');
- $r->print('<select name="metacourse" >');
- }
- my $course_key = $key;
- $course_key =~ s/\.metadata\..*//;
- $r->print('<option value="'.$course_key.'">');
- $r->print($env{$course_key.'.description'});
- $r->print('</option>');
+ foreach my $key (keys (%courses)) {
+ if ($meta_not_found) {
+ undef($meta_not_found);
+ $r->print('<h3>Portfolio Meta-Data</h3><br />');
+ $r->print('<form action="" method="post">');
+ $r->print('Select your course<br />');
+ $r->print('<select name="metacourse" >');
}
+ $r->print('<option value="'.$key.'">');
+ $r->print($courses{$key});
+ $r->print('</option>');
}
unless ($meta_not_found) {
$r->print('</select><br />');
- $r->print('<input type="submit" value="Assign Instructor Metadata" />');
+ $r->print('<input type="submit" value="Assign Portfolio Metadata" />');
$r->print('</form>');
}
return 'ok';
@@ -470,10 +476,39 @@ sub relatedfield {
sub prettyinput {
my ($type,$value,$fieldname,$formname,
- $relatedsearchflag,$relatedsep,$relatedvalue,$size)=@_;
+ $relatedsearchflag,$relatedsep,$relatedvalue,$size,$course_key)=@_;
if (! defined($size)) {
$size = 80;
}
+ if (defined($course_key)) {
+ my $stu_add;
+ my $only_one;
+ if ($env{$course_key.'.metadata.'.$_.'.options'} =~ m/stuadd/) {
+ $stu_add = 'true';
+ }
+ if ($env{$course_key.'.metadata.'.$_.'.options'} =~ m/onlyone/) {
+ $only_one = 'true';
+ }
+ if ($type eq 'author') {
+ }
+ if ($type eq 'authorspace') {
+ }
+ if ($type eq 'modifyinguser') {
+ }
+ if ($type eq 'subject') {
+ }
+ if ($type eq 'keywords') {
+ }
+ if ($type eq 'notes') {
+ }
+ if ($type eq 'abstract') {
+ if (($type eq 'lowestgradelevel') ||
+ ($type eq 'highestgradelevel')) {
+ return &Apache::loncommon::select_level_form($value,$fieldname).
+ &relatedfield(0,$relatedsearchflag,$relatedsep);
+ }
+ return();
+ }
# Language
if ($type eq 'language') {
return &selectbox($fieldname,
@@ -932,6 +967,7 @@ sub present_editable_metadata {
my $fn=&Apache::lonnet::filelocation('',$uri);
$disuri=~s/^\/\~/\/priv\//;
$disuri=~s/\.meta$//;
+ $disuri=~s|^/editupload||;
my $target=$uri;
$target=~s/^\/\~/\/res\/$env{'request.role.domain'}\//;
$target=~s/\.meta$//;
@@ -985,7 +1021,7 @@ ENDDEL
%Apache::lonpublisher::metadatakeys=();
my $result=&Apache::lonnet::getfile($fn);
if ($result == -1){
- $r->print('Creating new '.$fn);
+ $r->print('Creating new '.$disuri);
} else {
&Apache::lonpublisher::metaeval($result);
}
@@ -1018,40 +1054,21 @@ ENDEDIT
$Apache::lonpublisher::metadatafields{'copyright'}=
'default';
}
- $output.=('<p>'.$lt{$_}.': '.
- &prettyinput($_,
- $Apache::lonpublisher::metadatafields{$_},
- 'new_'.$_,'defaultmeta').'</p>');
if ($env{'form.metacourse'}) {
- $r->print('This is the instructor metadata area<br />');
- # have to find all the metadata items, so we'll loop through and find them
- $r->print('<form method="post" action="" size="3" >');
- $r->print('The course is: '.$env{'form.metacourse'}.'<br>');
- foreach my $key (sort keys %env) {
- if ($key=~m/^($env{'form.metacourse'}\.metadata\.)(\d+)\.title/) {
- my $key_base = $1;
- my $item_num = $2;
- # found one, so let's display it
- my $title = $env{$key_base.$item_num.'.title'};
- my $type = $env{$key_base.$item_num.'.type'};
- my @choices = sort(split /, /,$env{$key_base.$item_num.'.values'});
- $r->print($title.'<br />');
- $r->print($type.'<br />');
-
- foreach my $word (@choices) {
- my $checked;
- if ($Apache::lonpublisher::metadatafields{'coursekeyword'}=~ m/$word/) {
- $checked = 1;
- } else {
- undef($checked);
+ # handle restrictions here
+ $env{'form.metacourse'} =~ m/(^.+)\.description$/;
+ my $key_base = $1;
+ if ($env{$key_base.'.metadata.'.$_.'.options'} =~ m/active/) {
+ $output.=('<p>'.$lt{$_}.': '.
+ &prettyinput($_,
+ $Apache::lonpublisher::metadatafields{$_},
+ 'new_'.$_,'defaultmeta',undef,undef,undef,undef,$key_base).'</p>');
}
- $r->print(&Apache::lonhtmlcommon::checkbox('instmeta_'.$env{'form.metacourse'}.'_'.$item_num,$checked,$word).$word.'<br />');
- }
- }
- }
- $r->print('<br /><input type="submit" name="store" value="Assign Meta-data" />');
- $r->print('</form>');
- return 'ok';
+ } else {
+ $output.=('<p>'.$lt{$_}.': '.
+ &prettyinput($_,
+ $Apache::lonpublisher::metadatafields{$_},
+ 'new_'.$_,'defaultmeta').'</p>');
}
}
if ($env{'form.store'}) {
@@ -1059,9 +1076,6 @@ ENDEDIT
my $formname='store';
my $file_content;
foreach my $meta_field (keys %env) {
- if ($meta_field=~m/^form.instmeta_(.+)_(\d+)$/) {
- $r->print('Found a field<br>');
- }
if (&Apache::loncommon::get_env_multiple('form.keywords')) {
$Apache::lonpublisher::metadatafields{'coursekeyword'} =
join (', ', &Apache::loncommon::get_env_multiple('form.keywords'));
@@ -1096,7 +1110,6 @@ ENDEDIT
$env{'form.'.$formname.'.filename'}=$new_fn;
&Apache::lonnet::userfileupload('uploaddoc','',
'portfolio'.$env{'form.currentpath'});
- my $status =&Apache::lonnet::userfileupload($formname,'','portfolio');
if (&Apache::lonnet::userfileupload($formname,'','portfolio') eq 'error: no uploaded file') {
$r->print('<p><font color="red">'.
&mt('Could not write metadata').', '.