--- loncom/interface/lonmeta.pm	2005/04/07 06:56:23	1.96
+++ loncom/interface/lonmeta.pm	2005/08/09 00:24:55	1.104
@@ -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.104 2005/08/09 00:24:55 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('<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 $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>');
+        }
+    }
+    unless ($meta_not_found) {
+        $r->print('</select><br />');
+        $r->print('<input type="submit" value="Assign Instructor Metadata" />');
+        $r->print('</form>');
+    }
+    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('<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))) {
@@ -873,6 +921,31 @@ sub print_dynamic_metadata {
     $r->print("</table>");
     return;
 }
+sub save_instructor_metadata {
+    my ($r) = @_;
+    $r->print('This is the save instructor metadata area<br />');
+    my @words =  &Apache::loncommon::get_env_multiple('form.keywords');
+    foreach my $word (@words) {
+        $r->print('You entered:'.$word.'<br />');
+    }
+    return 'ok';
+}
+sub present_instructor_metadata {
+    my ($r,$uri, $file_type) = @_;
+    $r->print('This is the instructor metadata area<br />');
+    my @keywords = sort(split /, /,$env{$env{'form.metacourse'}.'.metadata.keywords'});
+    $r->print($env{'form.metacourse'}.'<br />');
+    $r->print('<form method="post" action="" size="3" >');
+    $r->print('<select name="keywords" size="3" multiple>');
+    foreach my $word (@keywords) {
+        $r->print('<option>'.$word.'</option>');
+    }
+    $r->print('</select>');
+    $r->print('<br /><input type="submit" value="Assign Meta-data" />');
+    $r->print('</form>');
+    return 'ok';
+}
+
 
 #####################################################
 #####################################################
@@ -894,20 +967,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(<<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 +1015,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 +1118,5 @@ ENDEDIT
 
 1;
 __END__
+
+