--- loncom/interface/lonmeta.pm	2005/03/17 21:32:17	1.94
+++ 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.94 2005/03/17 21:32:17 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
 #
@@ -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;
@@ -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.'<br />');
+            push @courses, $key;
+        }
+    }
+    foreach (@courses) {
+        $r->print($_.' was found<br />');
+    }
+    $r->print('<h3>Portfolio Meta-Data</h3><br />');
+    $r->print('<form action="" method="post">');
+    $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>Portfolio 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>');
+        }
+    }
+    unless ($meta_not_found) {
+        $r->print('</select><br />');
+        $r->print('<input type="submit" value="Assign Portfolio Metadata" />');
+        $r->print('</form>');
+    }
+    return 'ok';
+}
 # Pretty printing of metadata field
 
 sub prettyprint {
@@ -338,7 +382,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
@@ -545,10 +589,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
@@ -578,6 +624,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))) {
@@ -632,7 +687,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>';
@@ -681,7 +736,7 @@ $versiondisplay
 $table
 </table>
 ENDHEAD
-    if ($ENV{'user.adv'}) {
+    if ($env{'user.adv'}) {
         &print_dynamic_metadata($r,$uri,\%content);
     }
     return;
@@ -822,8 +877,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').
@@ -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/^\/\~/\/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$/) {
@@ -921,8 +1000,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 '.$disuri);
         } else {
             &Apache::lonpublisher::metaeval($result);
         }
@@ -937,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',
@@ -947,9 +1025,9 @@ ENDEDIT
                  'obsolete','obsoletereplacement');
         }
         foreach (@fields) {
-            if (defined($ENV{'form.new_'.$_})) {
+            if (defined($env{'form.new_'.$_})) {
                 $Apache::lonpublisher::metadatafields{$_}=
-                    $ENV{'form.new_'.$_};
+                    $env{'form.new_'.$_};
             }
             if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
                 $Apache::lonpublisher::metadatafields{'copyright'}=
@@ -959,11 +1037,51 @@ ENDEDIT
                       &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);
+                }
+                $r->print(&Apache::lonhtmlcommon::checkbox('instmeta_'.$env{'form.metacourse'}.'_'.$item_num,$checked,$word).$word.'<br />');
+            }
         }
-        if ($ENV{'form.store'}) {
+    }   
+    $r->print('<br /><input type="submit" name="store" value="Assign Meta-data" />');
+    $r->print('</form>');
+    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<br>');
+                }
+                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=$_;
@@ -989,10 +1107,10 @@ ENDEDIT
             if ($fn =~ /\/portfolio\//) {
                 $fn =~ /\/portfolio\/(.*)$/;
                 my $new_fn = '/'.$1;
-                $ENV{'form.'.$formname}=$file_content;
-                $ENV{'form.'.$formname.'.filename'}=$new_fn;
+                $env{'form.'.$formname}=$file_content;
+                $env{'form.'.$formname.'.filename'}=$new_fn;
                 &Apache::lonnet::userfileupload('uploaddoc','',
-	        	 'portfolio'.$ENV{'form.currentpath'});
+	        	 '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">'.
@@ -1010,6 +1128,9 @@ ENDEDIT
                         &mt('FAIL').'</font></p>');
                 } else {
                     print $mfh $file_content;
+		    $r->print('<p><font color="blue">'.&mt('Wrote Metadata').
+			      ' '.&Apache::lonlocal::locallocaltime(time).
+			      '</font></p>');
                 }
             }
         }
@@ -1022,3 +1143,5 @@ ENDEDIT
 
 1;
 __END__
+
+