--- loncom/interface/lonmeta.pm	2005/02/10 22:01:40	1.91
+++ loncom/interface/lonmeta.pm	2005/12/09 23:49:45	1.136
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.91 2005/02/10 22:01:40 banghart Exp $
+# $Id: lonmeta.pm,v 1.136 2005/12/09 23:49:45 albertel 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
 #
@@ -31,9 +31,9 @@ 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::lonhtmlcommon(); 
 use Apache::lonmsg;
 use Apache::lonpublisher;
 use Apache::lonlocal;
@@ -237,33 +237,24 @@ sub diffgraph {
 # The field names
 sub fieldnames {
     my $file_type=shift;
-    if ($file_type eq 'portfolio') {
-    return &Apache::lonlocal::texthash
-        (
-         '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');
-    } else {
-    return &Apache::lonlocal::texthash
-        (
-         'title' => 'Title',
+    my %fields = 
+        ('title' => 'Title',
          'author' =>'Author(s)',
          'authorspace' => 'Author Space',
          'modifyinguser' => 'Last Modifying User',
          'subject' => 'Subject',
+         'standards' => 'Standards',
          'keywords' => 'Keyword(s)',
          'notes' => 'Notes',
          'abstract' => 'Abstract',
          'lowestgradelevel' => 'Lowest Grade Level',
          'highestgradelevel' => 'Highest Grade Level',
-         'standards' => 'Standards',
+         'courserestricted' => 'Course Restricting Metadata');
+         
+    if (! defined($file_type) || $file_type ne 'portfolio') {
+        %fields = 
+        (%fields,
+         'domain' => 'Domain',
          'mime' => 'MIME Type',
          'language' => 'Language',
          'creationdate' => 'Creation Date',
@@ -293,11 +284,49 @@ sub fieldnames {
          'stdno'      => 'Total number of students who have worked on this problem',
          'difficulty' => 'Degree of difficulty',
          'disc'       => 'Degree of discrimination',
-	 'dependencies' => 'Resources used by this resource',
+	     'dependencies' => 'Resources used by this resource',
          );
-        }
+    }
+    return &Apache::lonlocal::texthash(%fields);
 }
 
+sub select_course {
+    my ($r)=@_;
+    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>Associate resource with a course</h3><br />');
+    $r->print('<form action="" method="post">');
+    $r->print('Select course <br />');
+    $r->print('<select name="metacourse" >');
+    my $meta_not_found = 1;
+    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" >');
+        }
+        $key =~ m/(^.+)\.description$/;
+        $r->print('<option value="'.$1.'">');
+        $r->print($courses{$key});
+        $r->print('</option>');
+    }
+    unless ($meta_not_found) {
+        $r->print('</select><br />');
+        $r->print('<input type="submit" value="Associate" />');
+        $r->print('</form>');
+    }
+    return 'ok';
+}
 # Pretty printing of metadata field
 
 sub prettyprint {
@@ -348,7 +377,7 @@ sub prettyprint {
 	return &Apache::loncommon::gradeleveldescription($value);
     }
     # Only for advance users below
-    if (! $ENV{'user.adv'}) { 
+    if (! $env{'user.adv'}) { 
         return '<i>- '.&mt('not displayed').' -</i>';
     }
     # File
@@ -450,10 +479,70 @@ sub relatedfield {
 
 sub prettyinput {
     my ($type,$value,$fieldname,$formname,
-	$relatedsearchflag,$relatedsep,$relatedvalue,$size)=@_;
+	$relatedsearchflag,$relatedsep,$relatedvalue,$size,$course_key)=@_;
     if (! defined($size)) {
         $size = 80;
     }
+    my $output;
+    if (defined($course_key)) {
+        my $stu_add;
+        my $only_one;
+        my %meta_options;
+        my @cur_values_inst;
+        my $cur_values_stu;
+        my $values = $env{$course_key.'.metadata.'.$type.'.values'};
+        if ($env{$course_key.'.metadata.'.$type.'.options'} =~ m/stuadd/) {
+            $stu_add = 'true';
+        }
+        if ($env{$course_key.'.metadata.'.$type.'.options'} =~ m/onlyone/) {
+            $only_one = 'true';
+        }
+        # need to take instructor values out of list where instructor and student
+        # values may be mixed.
+        if ($values) {
+            foreach my $item (split(/,/,$values)) {
+                $item =~ s/^\s+//;
+                $meta_options{$item} = $item;
+            }
+            foreach my $item (split(/,/,$value)) {
+                $item =~ s/^\s+//;
+                if ($meta_options{$item}) {
+                    push(@cur_values_inst,$item);
+                } else {
+                    $cur_values_stu .= $item.',';
+                }
+            }
+        } else {
+            $cur_values_stu = $value;
+        }
+        if ($type eq 'courserestricted') {
+            return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />');
+        }
+        if (($type eq 'keywords') || ($type eq 'subject')
+             || ($type eq 'author')||($type eq  'notes')
+             || ($type eq  'abstract')|| ($type eq  'title')|| ($type eq  'standards')) {
+            if ($values) {
+                if ($only_one) {
+                    $output .= (&Apache::loncommon::select_form($cur_values_inst[0],'new_'.$type,%meta_options));
+                } else {
+                    $output .= (&Apache::loncommon::multiple_select_form('new_'.$type,\@cur_values_inst,undef,\%meta_options));
+                }
+            }
+            if ($stu_add) {
+                $output .= '<input type="text" name="'.$fieldname.'" size="'.$size.'" '.
+                'value="'.$cur_values_stu.'" />'.
+                &relatedfield(1,$relatedsearchflag,$relatedsep,$fieldname,
+                      $relatedvalue); 
+            }
+            return ($output);
+        }
+        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,
@@ -514,6 +603,10 @@ sub prettyinput {
 	    ",'rights')\">".&mt('Select').'</a>'.
             &relatedfield(0,$relatedsearchflag,$relatedsep); 
     }
+    if ($type eq 'courserestricted') {
+            return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />');
+    }
+
     # Dates
     if (($type eq 'creationdate') ||
 	($type eq 'lastrevisiondate')) {
@@ -546,7 +639,8 @@ sub handler {
     #
     my ($resdomain,$resuser)=
         (&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//);
-    $r->print('<html><head><title>'.
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html.'<head><title>'.
               'Catalog Information'.
               '</title></head>');
     if ($uri=~m:/adm/bombs/(.*)$:) {
@@ -554,10 +648,12 @@ sub handler {
         # Looking for all bombs?
         &report_bombs($r,$uri);
     } elsif ($uri=~/\/portfolio\//) {
+	($resdomain,$resuser)=
+	    (&Apache::lonnet::declutter($uri)=~m|^(\w+)/(\w+)/portfolio|);
         $r->print(&Apache::loncommon::bodytag
           ('Edit Portfolio File Information','','','',$resdomain));
         &present_editable_metadata($r,$uri,'portfolio');
-        
+        &select_course($r);
     } elsif ($uri=~/^\/\~/) { 
         # Construction space
         $r->print(&Apache::loncommon::bodytag
@@ -587,6 +683,15 @@ sub report_bombs {
     $r->print('<h1>'.&Apache::lonnet::clutter($uri).'</h1>');
     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);
+<form method="post">
+<input type="submit" name="clearbombs" value="$clear" />
+</form>
+ENDCLEAR
         my %brokenurls = 
             &Apache::lonmsg::all_url_author_res_msg($author,$domain);
         foreach (sort(keys(%brokenurls))) {
@@ -641,7 +746,7 @@ sub present_uneditable_metadata {
     # obsolete
     my $obsolete=$content{'obsolete'};
     my $obsoletewarning='';
-    if (($obsolete) && ($ENV{'user.adv'})) {
+    if (($obsolete) && ($env{'user.adv'})) {
         $obsoletewarning='<p><font color="red">'.
             &mt('This resource has been marked obsolete by the author(s)').
             '</font></p>';
@@ -690,7 +795,7 @@ $versiondisplay
 $table
 </table>
 ENDHEAD
-    if ($ENV{'user.adv'}) {
+    if ($env{'user.adv'}) {
         &print_dynamic_metadata($r,$uri,\%content);
     }
     return;
@@ -831,8 +936,8 @@ sub print_dynamic_metadata {
         $r->print('<h4>'.&mt('No Evaluation Data is available for this resource.').'</h4>');
     }
     $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('<h4>'.&mt('Evaluation Comments').' ('.
                       &mt('visible to author and co-authors only').
@@ -883,6 +988,8 @@ sub print_dynamic_metadata {
     return;
 }
 
+
+
 #####################################################
 #####################################################
 ###                                               ###
@@ -898,25 +1005,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/^\/\~/\/res\/$env{'request.role.domain'}\//;
     $target=~s/\.meta$//;
     my $bombs=&Apache::lonmsg::retrieve_author_res_msg($target);
     if ($bombs) {
-        if ($ENV{'form.delmsg'}) {
+        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(<<ENDBOMBS);
 <h1>$disuri</h1>
 <form method="post" name="defaultmeta">
-<input type="submit" name="delmsg" value="$del" />
-<br />$bombs
 ENDBOMBS
+        if ($showdel) {
+	    $r->print(<<ENDDEL);
+<input type="submit" name="delmsg" value="$del" />
+<input type="submit" name="clearmsg" value="$clear" />
+ENDDEL
+        } else {
+            $r->print('<a href="'.$disuri.'" />'.$goback.'</a>');
+	}
+	$r->print('<br />'.$bombs);
     } else {
         my $displayfile='Catalog Information for '.$disuri;
         if ($disuri=~/\/default$/) {
@@ -928,7 +1057,12 @@ ENDBOMBS
         }
         %Apache::lonpublisher::metadatafields=();
         %Apache::lonpublisher::metadatakeys=();
-        &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile($fn));
+        my $result=&Apache::lonnet::getfile($fn);
+        if ($result == -1){
+            $r->print('Creating new '.$disuri);
+        } else {
+            &Apache::lonpublisher::metaeval($result);
+        }
         $r->print(<<ENDEDIT);
 <h1>$displayfile</h1>
 <form method="post" name="defaultmeta">
@@ -941,7 +1075,7 @@ ENDEDIT
 	my @fields;
 	if ($file_type eq 'portfolio') {
 	    @fields =  ('author','title','subject','keywords','abstract','notes','lowestgradelevel',
-	                'highestgradelevel');
+	                'highestgradelevel','standards','courserestricted');
 	} else {
 	    @fields = ('author','title','subject','keywords','abstract','notes',
                  'copyright','customdistributionfile','language',
@@ -949,51 +1083,117 @@ ENDEDIT
                  'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
                  'obsolete','obsoletereplacement');
         }
-        foreach (@fields) {
-            if (defined($ENV{'form.new_'.$_})) {
-                $Apache::lonpublisher::metadatafields{$_}=
-                    $ENV{'form.new_'.$_};
+        my $metacourse;
+        if ($env{'form.metacourse'} ) {
+            $Apache::lonpublisher::metadatafields{'courserestricted'} = $env{'form.metacourse'};
+            $metacourse = $env{'form.metacourse'};
+         } else {
+            if (! $Apache::lonpublisher::metadatafields{'courserestricted'}) {
+                $Apache::lonpublisher::metadatafields{'courserestricted'}=
+                    'none';
+                $metacourse = 'none';
+            } else {
+                $metacourse = $Apache::lonpublisher::metadatafields{'courserestricted'};
             }
-            if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
+        }
+        if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
                 $Apache::lonpublisher::metadatafields{'copyright'}=
-                    'default';
+                'default';
+        }
+        if ($metacourse ne 'none') {
+             $r->print('Using: <strong> '.$env{$metacourse.".description"}."</strong> metadata framework<br />");
+        }
+        foreach my $field_name(@fields) {
+
+            if (defined($env{'form.new_'.$field_name})) {
+                $Apache::lonpublisher::metadatafields{$field_name}=
+                    join(',',&Apache::loncommon::get_env_multiple('form.new_'.$field_name));
+            }
+            if ($metacourse ne 'none') {
+                # handle restrictions here
+                if ($env{$metacourse.'.metadata.'.$field_name.'.options'} =~ m/active/){
+                    $output.=('<p>'.$lt{$field_name}.': '.
+                              &prettyinput($field_name,
+				   $Apache::lonpublisher::metadatafields{$field_name},
+				   'new_'.$field_name,'defaultmeta',undef,undef,undef,undef,$metacourse).'</p>');
+                 } elsif ($field_name eq 'courserestricted') {
+                            $output.=(
+                                &prettyinput($field_name,
+				    $Apache::lonpublisher::metadatafields{$field_name},
+				    'new_'.$field_name,'defaultmeta',undef,undef,undef,undef,$metacourse));
+                 }
+            } else {
+                if ($field_name ne 'courserestricted') {
+                    $output.=('<p>'.$lt{$field_name}.': '.
+                            &prettyinput($field_name,
+				   $Apache::lonpublisher::metadatafields{$field_name},
+				   'new_'.$field_name,'defaultmeta').'</p>');
+	        } else {
+                    $output.=&prettyinput($field_name,
+				   $Apache::lonpublisher::metadatafields{$field_name},
+				   'new_'.$field_name,'defaultmeta');
+                }
             }
-            $output.=('<p>'.$lt{$_}.': '.
-                      &prettyinput($_,
-				   $Apache::lonpublisher::metadatafields{$_},
-				   'new_'.$_,'defaultmeta').'</p>');
         }
-        if ($ENV{'form.store'}) {
+        if ($env{'form.store'}) {
             my $mfh;
-            if (!  ($mfh=Apache::File->new('>'.$fn))) {
-                $r->print('<p><font color="red">'.
-                          &mt('Could not write metadata').', '.
-                          &mt('FAIL').'</font></p>');
+            my $formname='store'; 
+            my $file_content;
+            foreach my $meta_field (keys %env) {
+                if (&Apache::loncommon::get_env_multiple('form.new_keywords')) {
+                    $Apache::lonpublisher::metadatafields{'keywords'} = 
+                        join (',', &Apache::loncommon::get_env_multiple('form.new_keywords'));
+                }
+            }
+            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},
+                     '<>&"').
+                     '</'.$tag.'>';
+            }
+            if ($fn =~ /\/portfolio\//) {
+                $fn =~ /\/portfolio\/(.*)$/;
+                my $new_fn = '/'.$1;
+                $env{'form.'.$formname}=$file_content."\n";
+                $env{'form.'.$formname.'.filename'}=$new_fn;
+                &Apache::lonnet::userfileupload('uploaddoc','',
+	        	 'portfolio'.$env{'form.currentpath'});
+                if (&Apache::lonnet::userfileupload($formname,'','portfolio') eq 'error: no uploaded file') {
+                    $r->print('<p><font color="red">'.
+                      &mt('Could not write metadata').', '.
+                     &mt('FAIL').'</font></p>');
+                } else {
+                    $r->print('<p><font color="blue">'.&mt('Wrote Metadata').
+		  ' '.&Apache::lonlocal::locallocaltime(time).
+		  '</font></p>');
+                }
             } else {
-                foreach (sort keys %Apache::lonpublisher::metadatafields) {
-                    next if ($_ =~ /\./);
-                    my $unikey=$_;
-                    $unikey=~/^([A-Za-z]+)/;
-                    my $tag=$1;
-                    $tag=~tr/A-Z/a-z/;
-                    print $mfh "\n\<$tag";
-                    foreach (split(/\,/,
-                                 $Apache::lonpublisher::metadatakeys{$unikey})
-                             ) {
-                        my $value=
-                         $Apache::lonpublisher::metadatafields{$unikey.'.'.$_};
-                        $value=~s/\"/\'\'/g;
-                        print $mfh ' '.$_.'="'.$value.'"';
-                    }
-                    print $mfh '>'.
-                        &HTML::Entities::encode
-                        ($Apache::lonpublisher::metadatafields{$unikey},
-                         '<>&"').
-                         '</'.$tag.'>';
+                if (!  ($mfh=Apache::File->new('>'.$fn))) {
+                    $r->print('<p><font color="red">'.
+                        &mt('Could not write metadata').', '.
+                        &mt('FAIL').'</font></p>');
+                } else {
+                    print $mfh $file_content;
+		    $r->print('<p><font color="blue">'.&mt('Wrote Metadata').
+			      ' '.&Apache::lonlocal::locallocaltime(time).
+			      '</font></p>');
                 }
-                $r->print('<p><font color="blue">'.&mt('Wrote Metadata').
-			  ' '.&Apache::lonlocal::locallocaltime(time).
-			  '</font></p>');
             }
         }
 	$r->print($output.'<br /><input type="submit" name="store" value="'.
@@ -1005,3 +1205,5 @@ ENDEDIT
 
 1;
 __END__
+
+