--- loncom/interface/lonmeta.pm 2005/04/07 06:56:23 1.96 +++ loncom/interface/lonmeta.pm 2005/08/13 19:32:28 1.105 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.96 2005/04/07 06:56:23 albertel Exp $ +# $Id: lonmeta.pm,v 1.105 2005/08/13 19:32:28 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; @@ -288,6 +288,36 @@ sub fieldnames { return &Apache::lonlocal::texthash(%fields); } +sub select_course { + my ($r)=@_; + $r->print('

Instructor Selected Meta-Data


'); + $r->print('
'); + $r->print('Select your course
'); + $r->print(''); + } + my $course_key = $key; + $course_key =~ s/\.metadata\..*//; + $r->print(''); + } + } + unless ($meta_not_found) { + $r->print('
'); + $r->print(''); + $r->print('
'); + } + return 'ok'; +} # Pretty printing of metadata field sub prettyprint { @@ -547,7 +577,16 @@ sub handler { } elsif ($uri=~/\/portfolio\//) { $r->print(&Apache::loncommon::bodytag ('Edit Portfolio File Information','','','',$resdomain)); - &present_editable_metadata($r,$uri,'portfolio'); + if ($env{'form.metacourse'}) { + &present_instructor_metadata($r,$uri,'portfolio'); + } + elsif ($env{'form.keywords'}) { + &save_instructor_metadata($r); + &select_course($r); + } else { + &present_editable_metadata($r,$uri,'portfolio'); + &select_course($r); + } } elsif ($uri=~/^\/\~/) { # Construction space @@ -578,6 +617,15 @@ sub report_bombs { $r->print('

'.&Apache::lonnet::clutter($uri).'

'); my ($domain,$author)=($uri=~/^(\w+)\/(\w+)\//); if (&Apache::loncacc::constructaccess('/~'.$author.'/',$domain)) { + if ($env{'form.clearbombs'}) { + &Apache::lonmsg::clear_author_res_msg($uri); + } + my $clear=&mt('Clear all Messages in Subdirectory'); + $r->print(< + + +ENDCLEAR my %brokenurls = &Apache::lonmsg::all_url_author_res_msg($author,$domain); foreach (sort(keys(%brokenurls))) { @@ -873,6 +921,81 @@ sub print_dynamic_metadata { $r->print(""); return; } +sub save_instructor_metadata { + my ($r) = @_; + my $uri=$r->uri; + my $fn=&Apache::lonnet::filelocation('',$uri); + my @words = &Apache::loncommon::get_env_multiple('form.keywords'); + $r->print('This is the save instructor metadata area
'); + my $mfh; + my $formname='store'; + my $file_content; + foreach (sort keys %Apache::lonpublisher::metadatafields) { + next if ($_ =~ /\./); + my $unikey=$_; + $unikey=~/^([A-Za-z]+)/; + my $tag=$1; + $tag=~tr/A-Z/a-z/; + $file_content.= "\n\<$tag"; + foreach (split(/\,/, + $Apache::lonpublisher::metadatakeys{$unikey}) + ) { + my $value=$Apache::lonpublisher::metadatafields{$unikey.'.'.$_}; + $value=~s/\"/\'\'/g; + $file_content.=' '.$_.'="'.$value.'"' ; + # print $mfh ' '.$_.'="'.$value.'"'; + } + $file_content.= '>'. + &HTML::Entities::encode + ($Apache::lonpublisher::metadatafields{$unikey}, + '<>&"'). + ''; + } + + foreach my $word (@words) { + $r->print('You entered:'.$word.'
'); + } + my $tag = 'keywords'; + $file_content.= "\n\<$tag"; + $file_content.= '>'. + &HTML::Entities::encode + (join(', ',@words), + '<>&"'). + ''; + $fn =~ /\/portfolio\/(.*)$/; + my $new_fn = '/'.$1; + $env{'form.'.$formname}=$file_content; + $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('

'. + &mt('Could not write metadata').', '. + &mt('FAIL').'

'); + } else { + $r->print('

'.&mt('Wrote Metadata'). + ' '.&Apache::lonlocal::locallocaltime(time). + '

'); + } + return 'ok'; +} +sub present_instructor_metadata { + my ($r,$uri, $file_type) = @_; + $r->print('This is the instructor metadata area
'); + my @keywords = sort(split /, /,$env{$env{'form.metacourse'}.'.metadata.keywords'}); + $r->print($env{'form.metacourse'}.'
'); + $r->print('
'); + $r->print(''); + $r->print('
'); + $r->print('
'); + return 'ok'; +} + ##################################################### ##################################################### @@ -894,20 +1017,41 @@ sub present_editable_metadata { $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,8 +1065,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); } @@ -1025,3 +1168,5 @@ ENDEDIT 1; __END__ + +