--- loncom/interface/lonmeta.pm	2005/03/18 16:47:31	1.95
+++ loncom/interface/lonmeta.pm	2005/07/13 22:09:11	1.99
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.95 2005/03/18 16:47:31 albertel Exp $
+# $Id: lonmeta.pm,v 1.99 2005/07/13 22:09:11 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,7 +31,7 @@ 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::lonmsg;
@@ -338,7 +338,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
@@ -578,6 +578,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 +641,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 +690,7 @@ $versiondisplay
 $table
 </table>
 ENDHEAD
-    if ($ENV{'user.adv'}) {
+    if ($env{'user.adv'}) {
         &print_dynamic_metadata($r,$uri,\%content);
     }
     return;
@@ -822,8 +831,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').
@@ -890,24 +899,45 @@ sub present_editable_metadata {
     $disuri=~s/^\/\~/\/priv\//;
     $disuri=~s/\.meta$//;
     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 +951,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);
         }
@@ -947,9 +976,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'}=
@@ -960,7 +989,7 @@ ENDEDIT
 				   $Apache::lonpublisher::metadatafields{$_},
 				   'new_'.$_,'defaultmeta').'</p>');
         }
-        if ($ENV{'form.store'}) {
+        if ($env{'form.store'}) {
             my $mfh;
             my $formname='store';
             my $file_content;
@@ -989,10 +1018,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">'.
@@ -1025,3 +1054,5 @@ ENDEDIT
 
 1;
 __END__
+
+