--- loncom/interface/lonmeta.pm 2005/05/09 01:51:44 1.97
+++ loncom/interface/lonmeta.pm 2005/10/14 16:34:17 1.112
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.97 2005/05/09 01:51:44 banghart Exp $
+# $Id: lonmeta.pm,v 1.112 2005/10/14 16:34:17 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -17,7 +17,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
# along with LON-CAPA; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
@@ -33,7 +33,7 @@ use LONCAPA::lonmetadata();
use Apache::Constants qw(:common);
use Apache::lonnet;
use Apache::loncommon();
-use Apache::lonhtmlcommon();
+use Apache::lonhtmlcommon();
use Apache::lonmsg;
use Apache::lonpublisher;
use Apache::lonlocal;
@@ -238,16 +238,16 @@ sub diffgraph {
sub fieldnames {
my $file_type=shift;
my %fields =
- ('title' => 'Title',
- 'author' =>'Author(s)',
- 'authorspace' => 'Author Space',
- 'modifyinguser' => 'Last Modifying User',
- 'subject' => 'Subject',
- 'keywords' => 'Keyword(s)',
- 'notes' => 'Notes',
- 'abstract' => 'Abstract',
- 'lowestgradelevel' => 'Lowest Grade Level',
- 'highestgradelevel' => 'Highest Grade Level');
+ ('metadata.title' => 'Title',
+ 'metadata.author' =>'Author(s)',
+ 'metadata.authorspace' => 'Author Space',
+ 'metadata.modifyinguser' => 'Last Modifying User',
+ 'metadata.subject' => 'Subject',
+ 'metadata.keywords' => 'Keyword(s)',
+ 'metadata.notes' => 'Notes',
+ 'metadata.abstract' => 'Abstract',
+ 'metadata.lowestgradelevel' => 'Lowest Grade Level',
+ 'metadata.highestgradelevel' => 'Highest Grade Level');
if (! defined($file_type) || $file_type ne 'portfolio') {
%fields =
(%fields,
@@ -288,6 +288,50 @@ sub fieldnames {
return &Apache::lonlocal::texthash(%fields);
}
+sub select_course {
+ my ($r)=@_;
+ my @courses;
+ foreach my $key (keys (%env)) {
+
+ if ($key =~ m/^(course\..+)\.metadata\..+\.options/) {
+ my $course_key = $1;
+ $course_key .= '.description';
+ $r->print($env{$course_key}.' of '.$course_key.' ');
+ push @courses, $key;
+ }
+ }
+ foreach (@courses) {
+ $r->print($_.' was found ');
+ }
+ $r->print('
Portfolio Meta-Data
');
+ $r->print('
+ENDCLEAR
my %brokenurls =
&Apache::lonmsg::all_url_author_res_msg($author,$domain);
foreach (sort(keys(%brokenurls))) {
@@ -874,6 +929,8 @@ sub print_dynamic_metadata {
return;
}
+
+
#####################################################
#####################################################
### ###
@@ -889,25 +946,47 @@ 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$//;
my $bombs=&Apache::lonmsg::retrieve_author_res_msg($target);
if ($bombs) {
+ my $showdel=1;
if ($env{'form.delmsg'}) {
if (&Apache::lonmsg::del_url_author_res_msg($target) eq 'ok') {
$bombs=&mt('Messages deleted.');
+ $showdel=0;
} else {
$bombs=&mt('Error deleting messages');
}
}
- my $del=&mt('Delete Messages');
+ if ($env{'form.clearmsg'}) {
+ my $cleardir=$target;
+ $cleardir=~s/\/[^\/]+$/\//;
+ if (&Apache::lonmsg::clear_author_res_msg($cleardir) eq 'ok') {
+ $bombs=&mt('Messages cleared.');
+ $showdel=0;
+ } else {
+ $bombs=&mt('Error clearing messages');
+ }
+ }
+ my $del=&mt('Delete Messages for this Resource');
+ my $clear=&mt('Clear all Messages in Subdirectory');
+ my $goback=&mt('Back to Source File');
$r->print(<$disuri
-
- $bombs
ENDBOMBS
+ if ($showdel) {
+ $r->print(<
+
+ENDDEL
+ } else {
+ $r->print(''.$goback.'');
+ }
+ $r->print(' '.$bombs);
} else {
my $displayfile='Catalog Information for '.$disuri;
if ($disuri=~/\/default$/) {
@@ -921,7 +1000,7 @@ ENDBOMBS
%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);
}
@@ -936,7 +1015,7 @@ ENDEDIT
my $output;
my @fields;
if ($file_type eq 'portfolio') {
- @fields = ('author','title','subject','keywords','abstract','notes','lowestgradelevel',
+ @fields = ('author','metadata.title','metadata.subject','metadata.keywords','abstract','notes','lowestgradelevel',
'highestgradelevel');
} else {
@fields = ('author','title','subject','keywords','abstract','notes',
@@ -958,11 +1037,51 @@ ENDEDIT
&prettyinput($_,
$Apache::lonpublisher::metadatafields{$_},
'new_'.$_,'defaultmeta').'');
+ if ($env{'form.metacourse'}) {
+ $r->print('This is the instructor metadata area ');
+ # have to find all the metadata items, so we'll loop through and find them
+ $r->print('
');
+ $r->print('The course is: '.$env{'form.metacourse'}.' ');
+ 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.' ');
+ $r->print($type.' ');
+
+ foreach my $word (@choices) {
+ my $checked;
+ if ($Apache::lonpublisher::metadatafields{'coursekeyword'}=~ m/$word/) {
+ $checked = 1;
+ } else {
+ undef($checked);
+ }
+ $r->print(&Apache::lonhtmlcommon::checkbox('instmeta_'.$env{'form.metacourse'}.'_'.$item_num,$checked,$word).$word.' ');
+ }
+ }
+ }
+ $r->print(' ');
+ $r->print('
');
+ return 'ok';
+ }
}
if ($env{'form.store'}) {
my $mfh;
- my $formname='store';
+ my $formname='store';
my $file_content;
+ foreach my $meta_field (keys %env) {
+ if ($meta_field=~m/^form.instmeta_(.+)_(\d+)$/) {
+ $r->print('Found a field ');
+ }
+ if (&Apache::loncommon::get_env_multiple('form.keywords')) {
+ $Apache::lonpublisher::metadatafields{'coursekeyword'} =
+ join (', ', &Apache::loncommon::get_env_multiple('form.keywords'));
+ }
+ }
foreach (sort keys %Apache::lonpublisher::metadatafields) {
next if ($_ =~ /\./);
my $unikey=$_;
@@ -1025,4 +1144,4 @@ ENDEDIT
1;
__END__
-
\ No newline at end of file
+