--- loncom/publisher/lonpublisher.pm	2003/12/28 20:12:59	1.156
+++ loncom/publisher/lonpublisher.pm	2003/12/31 03:02:49	1.159
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.156 2003/12/28 20:12:59 www Exp $
+# $Id: lonpublisher.pm,v 1.159 2003/12/31 03:02:49 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -127,6 +127,7 @@ use Apache::lonmysql;
 use Apache::lonlocal;
 use Apache::loncfile;
 use Apache::lonmeta;
+use Apache::lonmsg;
 use vars qw(%metadatafields %metadatakeys);
 
 my %addid;
@@ -317,8 +318,7 @@ sub textfield {
     $value=~s/\s+$//gs;
     $value=~s/\s+/ /gs;
     $title=&mt($title);
-    my $uctitle=uc($title);
-    return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
+    return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:".
            "</b></font></p><br />".
            '<input type="text" name="'.$name.'" size=80 value="'.$value.'" />';
 }
@@ -331,9 +331,8 @@ sub hiddenfield {
 sub selectbox {
     my ($title,$name,$value,$functionref,@idlist)=@_;
     $title=&mt($title);
-    my $uctitle=uc($title);
     $value=(split(/\s*,\s*/,$value))[-1];
-    my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
+    my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:".
 	'</b></font></p><br /><select name="'.$name.'">';
     foreach (@idlist) {
         $selout.='<option value=\''.$_.'\'';
@@ -1018,6 +1017,9 @@ sub publish {
         }
 
     } else {
+# ------------------------------------------ See if anything new in file itself
+ 
+	$allmeta=&parseformeta($source,$style);
 # ---------------------- Read previous metafile, remember parameters and stores
 
         $scrout.=&metaread($logfile,$source.'.meta');
@@ -1028,9 +1030,6 @@ sub publish {
 		delete $metadatafields{$_};
             }
         }
-# ------------------------------------------ See if anything new in file itself
- 
-	$allmeta=&parseformeta($source,$style);
    }
 
        
@@ -1112,7 +1111,7 @@ sub publish {
 # --------------------------------------------------- Scan content for keywords
 
         my $keywords_help = Apache::loncommon::help_open_topic("Publishing_Keywords");
-        my $KEYWORDS=&mt('KEYWORDS');
+        my $KEYWORDS=&mt('Keywords');
 	my $CheckAll=&mt('check all');
 	my $UncheckAll=&mt('uncheck all');
 	my $keywordout=<<"END";
@@ -1163,7 +1162,7 @@ END
 	$scrout.=&textfield('Notes','notes',$metadatafields{'notes'});
 
 	$scrout.=
-	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>".&mt('ABSTRACT').":".
+	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>".&mt('Abstract').":".
 	    "</b></font></p><br />".
 	    '<textarea cols="80" rows="5" name="abstract">'.
 	    $metadatafields{'abstract'}.'</textarea></p>';
@@ -1173,11 +1172,11 @@ END
 
 	$scrout.=
 	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>".
-	    uc(&mt('Lowest Grade Level:')).
+	    &mt('Lowest Grade Level').':'.
            "</b></font></p><br />".
 	   &Apache::loncommon::select_level_form($metadatafields{'lowestgradelevel'},'lowestgradelevel').
 	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>".
-	    uc(&mt('Highest Grade Level:')).
+	    &mt('Highest Grade Level').':'.
            "</b></font></p><br />".
 	   &Apache::loncommon::select_level_form($metadatafields{'highestgradelevel'},'highestgradelevel').
            &textfield('Standards','standards',$metadatafields{'standards'});
@@ -1236,7 +1235,7 @@ END
 	    $scrout.=&textfield('Custom Distribution File','customdistributionfile',
 				$metadatafields{'customdistributionfile'}).
 				    $copyright_help;
-	    my $uctitle=uc(&mt('Obsolete'));
+	    my $uctitle=&mt('Obsolete');
             $scrout.=
 		"\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
 		'</b></font> <input type="checkbox" name="obsolete" ';
@@ -1436,7 +1435,10 @@ sub phasetwo {
 	$r->print($error);
 	print $logfile "\n".$error;
     }
-
+# --------------------------------------------- Delete author resource messages
+    my $delresult=&Apache::lonmsg::del_url_author_res_msg($target); 
+    $r->print('<p>'.&mt('Removing error messages:').' '.$delresult.'</p>');
+    print $logfile "\nRemoving error messages: $delresult";
 # ----------------------------------------------------------- Copy old versions
    
     if (-e $target) {
@@ -1752,7 +1754,7 @@ sub handler {
 # -------------------------------------------------------------- Check filename
 
     my $fn=&Apache::lonnet::unescape($ENV{'form.filename'});
-
+    $fn=~s/\.meta$//;
   
     unless ($fn) { 
 	$r->log_reason($cuname.' at '.$cudom.