--- loncom/publisher/lonpublisher.pm	2003/12/28 20:12:59	1.156
+++ loncom/publisher/lonpublisher.pm	2005/02/28 21:28:18	1.185
@@ -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.185 2005/02/28 21:28:18 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -126,7 +126,8 @@ use Apache::loncommon();
 use Apache::lonmysql;
 use Apache::lonlocal;
 use Apache::loncfile;
-use Apache::lonmeta;
+use LONCAPA::lonmetadata;
+use Apache::lonmsg;
 use vars qw(%metadatafields %metadatakeys);
 
 my %addid;
@@ -137,6 +138,9 @@ my $docroot;
 my $cuname;
 my $cudom;
 
+my $registered_cleanup;
+my $modified_urls;
+
 =pod
 
 =item B<metaeval>
@@ -198,12 +202,17 @@ sub metaeval {
 		}
 	    }
 	    my $newentry=$parser->get_text('/'.$entry);
-	    if ($entry eq 'customdistributionfile') {
+	    if (($entry eq 'customdistributionfile') ||
+		($entry eq 'sourcerights')) {
 		$newentry=~s/^\s*//;
 		if ($newentry !~m|^/res|) { $newentry=$prefix.$newentry; }
 	    }
 # actually store
-	    $metadatafields{$unikey}=$newentry;
+	    if ( $entry eq 'rule' && exists($metadatafields{$unikey})) {
+		$metadatafields{$unikey}.=','.$newentry;
+	    } else {
+		$metadatafields{$unikey}=$newentry;
+	    }
 	}
     }
 }
@@ -317,23 +326,43 @@ 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:".
+    $ENV{'form.'.$name}=$value;
+    return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:".
            "</b></font></p><br />".
            '<input type="text" name="'.$name.'" size=80 value="'.$value.'" />';
 }
 
+sub text_with_browse_field {
+    my ($title,$name,$value,$restriction)=@_;
+    $value=~s/^\s+//gs;
+    $value=~s/\s+$//gs;
+    $value=~s/\s+/ /gs;
+    $title=&mt($title);
+    $ENV{'form.'.$name}=$value;
+    return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:".
+           "</b></font></p><br />".
+           '<input type="text" name="'.$name.'" size=80 value="'.$value.'" />'.
+	   '<a href="javascript:openbrowser(\'pubform\',\''.$name.'\',\''.$restriction.'\');">Select</a>&nbsp;'.
+	   '<a href="javascript:opensearcher(\'pubform\',\''.$name.'\');">Search</a>';
+	   
+}
+
 sub hiddenfield {
     my ($name,$value)=@_;
+    $ENV{'form.'.$name}=$value;
     return "\n".'<input type="hidden" name="'.$name.'" value="'.$value.'" />';
 }
 
 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:".
+    if (defined($value)) {
+	$ENV{'form.'.$name}=$value;
+    } else {
+	$ENV{'form.'.$name}=$idlist[0];
+    }
+    my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:".
 	'</b></font></p><br /><select name="'.$name.'">';
     foreach (@idlist) {
         $selout.='<option value=\''.$_.'\'';
@@ -345,6 +374,12 @@ sub selectbox {
     return $selout.'</select>';
 }
 
+sub select_level_form {
+    my ($value,$name)=@_;
+    $ENV{'form.'.$name}=$value;
+    if (!defined($value)) { $ENV{'form.'.$name}=0; }
+    return  &Apache::loncommon::select_level_form($value,$name);
+}
 #########################################
 #########################################
 
@@ -455,7 +490,8 @@ sub get_subscribed_hosts {
     while ($filename=readdir(DIR)) {
 	if ($filename=~/\Q$srcf\E\.(\w+)$/) {
 	    my $subhost=$1;
-	    if (($subhost ne 'meta' && $subhost ne 'subscription') &&
+	    if (($subhost ne 'meta' && $subhost ne 'subscription' &&
+		 $subhost ne 'tmp') &&
                 ($subhost ne $Apache::lonnet::perlvar{'lonHostID'})) {
 		push(@subscribed,$subhost);
 	    }
@@ -566,11 +602,11 @@ sub get_all_text_unbalanced {
 	} elsif ($token->[0] eq 'E')  {
 	    $result.=$token->[2];
 	}
-	if ($result =~ /(.*)\Q$tag\E(.*)/s) {
+	if ($result =~ /\Q$tag\E/s) {
+	    ($result,my $redo)=$result =~ /(.*)\Q$tag\E(.*)/is;
 	    #&Apache::lonnet::logthis('Got a winner with leftovers ::'.$2);
 	    #&Apache::lonnet::logthis('Result is :'.$1);
-	    $result=$1;
-	    my $redo=$tag.$2;
+	    $redo=$tag.$redo;
 	    push (@$pars,HTML::LCParser->new(\$redo));
 	    $$pars[-1]->xml_mode('1');
 	    last;
@@ -785,55 +821,56 @@ sub store_metadata {
         &Apache::lonnet::logthis($error);
         return ($error,undef);
     }
+    my $dbh = &Apache::lonmysql::get_dbh();
     if (($metadata{'obsolete'}) || ($metadata{'copyright'} eq 'priv') ||
 	($metadata{'copyright'} eq 'custom')) {
-# remove this entry
-	$status=&Apache::lonmysql::remove_from_table
-	    ('metadata','url',$metadata{'url'});
+        # remove this entry
+	$status=&LONCAPA::lonmetadata::delete_metadata($dbh,undef,
+                                                       $metadata{'url'});
     } else {
-# store new data
-# adjust some values to metadatadatabase (e.g., "usage" is a reserved word)
-	$metadata{'creationdate'}=
-	    &Apache::lonmysql::sqltime($metadata{'creationdate'}); 
-	$metadata{'lastrevisiondate'}=
-	    &Apache::lonmysql::sqltime($metadata{'lastrevisiondate'});
-	$metadata{'sequsage'}=$metadata{'usage'};
-	$metadata{'sequsage_list'}=$metadata{'usage_list'};
-	my %newmetadata=();
-# see if we have old entries
-	my @oldmeta=&Apache::lonmysql::get_rows('metadata',
-						"url LIKE BINARY '".
-						$metadata{'url'}."'");
-	if ($#oldmeta==0) {
-# yes, there is one old entry, transfer to newmetadata
-	    %newmetadata=&Apache::lonmeta::metadata_col_to_hash(@{$oldmeta[0]});
-# remove old entry
-	    $status=&Apache::lonmysql::remove_from_table
-		('metadata','url',$metadata{'url'});
-	} elsif ($#oldmeta>0) {
-# more than one entry fit - how did that happen?
-	    $error='<font color="red">Error occured retrieving old values in '.
-	      'metadata table in LON-CAPA database: '.$#oldmeta.
-	      ' matches</font>';
-	    &Apache::lonnet::logthis($error);
-	    return ($error,undef);
-	}
-# store new data on top of it
-	foreach (keys %metadata) {
-	    $newmetadata{$_}=$metadata{$_};
-	}
-	$status = &Apache::lonmysql::store_row('metadata',\%newmetadata);
+        $status = &LONCAPA::lonmetadata::update_metadata($dbh,undef,
+                                                         \%metadata);
     }
-    if (! defined($status)) {
+    if (defined($status) && $status ne '') {
         $error='<font color="red">Error occured storing new values in '.
             'metadata table in LON-CAPA database</font>';
         &Apache::lonnet::logthis($error);
+        &Apache::lonnet::logthis($status);
         return ($error,undef);
     }
     return (undef,$status);
 }
 
 
+# ========================================== Parse file for errors and warnings
+
+sub checkonthis {
+    my ($r,$source)=@_;
+    my $oldpath=$ENV{'request.filename'};
+    $ENV{'request.filename'}=$source;
+    &Apache::lonxml::xmlparse($r,'web',
+			      &Apache::lonnet::getfile($source));
+    undef($Apache::lonhomework::parsing_a_problem);
+    $ENV{'request.filename'}=$oldpath;
+    if (($Apache::lonxml::errorcount) ||
+	($Apache::lonxml::warningcount)) {
+	if ($Apache::lonxml::errorcount) {
+	    $r->print('<img src="/adm/lonMisc/bomb.gif" /><font color="red"><b>'.
+		      $Apache::lonxml::errorcount.' '.
+		      &mt('error(s)').'</b></font> ');
+	}
+	if ($Apache::lonxml::warningcount) {
+	    $r->print('<font color="blue">'.
+		      $Apache::lonxml::warningcount.' '.
+		      &mt('warning(s)').'</font>');
+	}
+    } else {
+	$r->print('<font color="green">'.&mt('ok').'</font>');
+    }
+    $r->rflush();
+    return ($Apache::lonxml::warningcount,$Apache::lonxml::errorcount);
+}
+
 # ============================================== Parse file itself for metadata
 #
 # parses a file with target meta, sets global %metadatafields %metadatakeys 
@@ -917,11 +954,11 @@ sub publish {
               $allowstr.="\n".'<allow src="'.$thisdep.'" />';
 	   }
            $scrout.='<br />';
-           unless ($thisdep=~/\*/) {
+           if ($thisdep!~/\*/ && $thisdep!~m|^/adm/|) {
 	       $scrout.='<a href="'.$thisdep.'">';
            }
            $scrout.='<tt>'.$thisdep.'</tt>';
-           unless ($thisdep=~/\*/) {
+           if ($thisdep!~/\*/ && $thisdep!~m|^/adm/|) {
 	       $scrout.='</a>';
                if (
        &Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'.
@@ -940,13 +977,8 @@ sub publish {
 	       }
            }
         }
-        $outstring=~s/\n*(\<\/[^\>]+\>)\s*$/$allowstr\n$1\n/s;
+        $outstring=~s/\n*(\<\/[^\>]+\>[^<]*)$/$allowstr\n$1\n/s;
 
-### FIXME: is this really what we want?
-# I dont' think so, to will corrupt any UTF-8 resources at least, 
-# and any encoding other than ISO-8859-1 will probably break
-	#Encode any High ASCII characters
-	#$outstring=&HTML::Entities::encode($outstring,"\200-\377");
 # ------------------------------------------------------------- Write modified.
 
         {
@@ -1004,6 +1036,7 @@ sub publish {
             $scrout.=&metaread($logfile,$currentpath.'default.meta',$prefix);
 	    $prefix=~s|^\.\./||;
         }
+
 # ----------------------------------------------------------- Parse file itself
 # read %metadatafields from file itself
  
@@ -1031,6 +1064,7 @@ sub publish {
 # ------------------------------------------ See if anything new in file itself
  
 	$allmeta=&parseformeta($source,$style);
+
    }
 
        
@@ -1090,32 +1124,40 @@ sub publish {
     }
 
             
-    foreach (split(/\W+/,$metadatafields{'keywords'})) {
-	$keywords{$_}=1;
+    foreach my $addkey (split(/[\"\'\,\;]/,$metadatafields{'keywords'})) {
+	$addkey=~s/\s+/ /g;
+	$addkey=~s/^\s//;
+	$addkey=~s/\s$//;
+	if ($addkey=~/\w/) {
+	    $keywords{$addkey}=1;
+	}
     }
 # --------------------------------------------------- Now we also have keywords
 # =============================================================================
-# INTERACTIVE MODE
-#
-    unless ($batch) {
-        $scrout.=
-	    '<form name="pubform" action="/adm/publish" method="post">'.
-            '<p><input type="submit" value="'.&mt('Finalize Publication').'" /></p>'.
-            &hiddenfield('phase','two').
-            &hiddenfield('filename',$ENV{'form.filename'}).
-	    &hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)).
-            &hiddenfield('dependencies',join(',',keys %allow)).
-            &textfield('Title','title',$metadatafields{'title'}).
-            &textfield('Author(s)','author',$metadatafields{'author'}).
-	    &textfield('Subject','subject',$metadatafields{'subject'});
+# interactive mode html goes into $intr_scrout
+# batch mode throws away this HTML
+# additionally all of the field functions have a by product of setting
+#   $ENV{'from.'..} so that it can be used by the phase two handler in
+#    batch mode
+
+    my $intr_scrout.=
+	'<form name="pubform" action="/adm/publish" method="post">'.
+	'<p><input type="submit" value="'.&mt('Finalize Publication').'" /></p>'.
+	&hiddenfield('phase','two').
+	&hiddenfield('filename',$ENV{'form.filename'}).
+	&hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)).
+	&hiddenfield('dependencies',join(',',keys %allow)).
+	&textfield('Title','title',$metadatafields{'title'}).
+	&textfield('Author(s)','author',$metadatafields{'author'}).
+	&textfield('Subject','subject',$metadatafields{'subject'});
 
 # --------------------------------------------------- Scan content for keywords
 
-        my $keywords_help = Apache::loncommon::help_open_topic("Publishing_Keywords");
-        my $KEYWORDS=&mt('KEYWORDS');
-	my $CheckAll=&mt('check all');
-	my $UncheckAll=&mt('uncheck all');
-	my $keywordout=<<"END";
+    my $keywords_help = Apache::loncommon::help_open_topic("Publishing_Keywords");
+    my $KEYWORDS=&mt('Keywords');
+    my $CheckAll=&mt('check all');
+    my $UncheckAll=&mt('uncheck all');
+    my $keywordout=<<"END";
 <script>
 function checkAll(field) {
     for (i = 0; i < field.length; i++)
@@ -1134,153 +1176,141 @@ function uncheckAll(field) {
 </p>
 <br />
 END
-	$keywordout.='<table border="2"><tr>';
-	my $colcount=0;
+    $keywordout.='<table border="2"><tr>';
+    my $colcount=0;
 
-	foreach (sort keys %keywords) {
-	    $keywordout.='<td><input type="checkbox" name="keywords" value="'.$_.'"';
-	    if ($metadatafields{'keywords'}) {
-		if ($metadatafields{'keywords'}=~/\Q$_\E/) {
-		    $keywordout.=' checked="on"';
-		}
-	    } elsif (&Apache::loncommon::keyword($_)) {
+    foreach (sort keys %keywords) {
+	$keywordout.='<td><label><input type="checkbox" name="keywords" value="'.$_.'"';
+	if ($metadatafields{'keywords'}) {
+	    if ($metadatafields{'keywords'}=~/\Q$_\E/) {
 		$keywordout.=' checked="on"';
+		$ENV{'form.keywords'}.=$_.',';
 	    }
-	    $keywordout.=' />'.$_.'</td>';
-	    if ($colcount>10) {
-		$keywordout.="</tr><tr>\n";
-		$colcount=0;
-	    }
-	    $colcount++;
+	} elsif (&Apache::loncommon::keyword($_)) {
+	    $keywordout.=' checked="on"';
+	    $ENV{'form.keywords'}.=$_.',';
 	}
+	$keywordout.=' />'.$_.'</label></td>';
+	if ($colcount>10) {
+	    $keywordout.="</tr><tr>\n";
+	    $colcount=0;
+	}
+	$colcount++;
+    }
+    $ENV{'form.keywords'}=~s/\,$//;
 
-	$keywordout.='</tr></table>';
+    $keywordout.='</tr></table>';
 
-	$scrout.=$keywordout;
+    $intr_scrout.=$keywordout;
 
-	$scrout.=&textfield('Additional Keywords','addkey','');
+    $intr_scrout.=&textfield('Additional Keywords','addkey','');
 
-	$scrout.=&textfield('Notes','notes',$metadatafields{'notes'});
+    $intr_scrout.=&textfield('Notes','notes',$metadatafields{'notes'});
 
-	$scrout.=
-	    "\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>';
+    $intr_scrout.=
+	"\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>';
 
-	$source=~/\.(\w+)$/;
+    $source=~/\.(\w+)$/;
 
 
-	$scrout.=
-	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>".
-	    uc(&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:')).
-           "</b></font></p><br />".
-	   &Apache::loncommon::select_level_form($metadatafields{'highestgradelevel'},'highestgradelevel').
-           &textfield('Standards','standards',$metadatafields{'standards'});
+    $intr_scrout.=
+	"\n<p><font color=\"#800000\" face=\"helvetica\"><b>".
+	&mt('Lowest Grade Level').':'.
+	"</b></font></p><br />".
+	&select_level_form($metadatafields{'lowestgradelevel'},'lowestgradelevel').
+	"\n<p><font color=\"#800000\" face=\"helvetica\"><b>".
+	&mt('Highest Grade Level').':'.
+	"</b></font></p><br />".
+	&select_level_form($metadatafields{'highestgradelevel'},'highestgradelevel').
+	&textfield('Standards','standards',$metadatafields{'standards'});
 
 
 
 
-	$scrout.=&hiddenfield('mime',$1);
+    $intr_scrout.=&hiddenfield('mime',$1);
 
-	my $defaultlanguage=$metadatafields{'language'};
-	$defaultlanguage =~ s/\s*notset\s*//g;
-	$defaultlanguage =~ s/^,\s*//g;
-	$defaultlanguage =~ s/,\s*$//g;
+    my $defaultlanguage=$metadatafields{'language'};
+    $defaultlanguage =~ s/\s*notset\s*//g;
+    $defaultlanguage =~ s/^,\s*//g;
+    $defaultlanguage =~ s/,\s*$//g;
 
-	$scrout.=&selectbox('Language','language',
-			    $defaultlanguage,
-			    \&Apache::loncommon::languagedescription,
-			    (&Apache::loncommon::languageids),
-			   );
+    $intr_scrout.=&selectbox('Language','language',
+			     $defaultlanguage,
+			     \&Apache::loncommon::languagedescription,
+			     (&Apache::loncommon::languageids),
+			     );
 
-	unless ($metadatafields{'creationdate'}) {
-	    $metadatafields{'creationdate'}=time;
-	}
-	$scrout.=&hiddenfield('creationdate',
-			      &Apache::lonmysql::unsqltime($metadatafields{'creationdate'}));
+    unless ($metadatafields{'creationdate'}) {
+	$metadatafields{'creationdate'}=time;
+    }
+    $intr_scrout.=&hiddenfield('creationdate',
+			       &Apache::lonmysql::unsqltime($metadatafields{'creationdate'}));
 
-	$scrout.=&hiddenfield('lastrevisiondate',time);
+    $intr_scrout.=&hiddenfield('lastrevisiondate',time);
 
 
-	$scrout.=&textfield('Publisher/Owner','owner',
-			    $metadatafields{'owner'});
+    $intr_scrout.=&textfield('Publisher/Owner','owner',
+			     $metadatafields{'owner'});
 
+# ---------------------------------------------- Retrofix for unused copyright
+    if ($metadatafields{'copyright'} eq 'free') {
+	$metadatafields{'copyright'}='default';
+	$metadatafields{'sourceavail'}='open';
+    }
+# ------------------------------------------------ Dial in reasonable defaults
+    my $defaultoption=$metadatafields{'copyright'};
+    unless ($defaultoption) { $defaultoption='default'; }
+    my $defaultsourceoption=$metadatafields{'sourceavail'};
+    unless ($defaultsourceoption) { $defaultsourceoption='closed'; }
+    unless ($style eq 'prv') {
 # -------------------------------------------------- Correct copyright for rat.
-        my $defaultoption=$metadatafields{'copyright'};
-        unless ($defaultoption) { $defaultoption='default'; }
-	unless ($style eq 'prv') {
-	    if ($style eq 'rat') {
-		if ($metadatafields{'copyright'} eq 'public') { 
-		    delete $metadatafields{'copyright'};
-                    $defaultoption='default';
-		}
-		$scrout.=&selectbox('Copyright/Distribution','copyright',
-				    $defaultoption,
-				    \&Apache::loncommon::copyrightdescription,
+	if ($style eq 'rat') {
+# -------------------------------------- Retrofix for non-applicable copyright
+	    if ($metadatafields{'copyright'} eq 'public') { 
+		delete $metadatafields{'copyright'};
+		$defaultoption='default';
+	    }
+	    $intr_scrout.=&selectbox('Copyright/Distribution','copyright',
+				     $defaultoption,
+				     \&Apache::loncommon::copyrightdescription,
 				    (grep !/^public$/,(&Apache::loncommon::copyrightids)));
-	    } else {
-		$scrout.=&selectbox('Copyright/Distribution','copyright',
-				    $defaultoption,
-				    \&Apache::loncommon::copyrightdescription,
-				    (&Apache::loncommon::copyrightids));
-	    }
-    
-	    my $copyright_help =
-		Apache::loncommon::help_open_topic('Publishing_Copyright');
-	    $scrout =~ s/DISTRIBUTION:/'DISTRIBUTION: ' . $copyright_help/ge;
-	    $scrout.=&textfield('Custom Distribution File','customdistributionfile',
-				$metadatafields{'customdistributionfile'}).
-				    $copyright_help;
-	    my $uctitle=uc(&mt('Obsolete'));
-            $scrout.=
-		"\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
-		'</b></font> <input type="checkbox" name="obsolete" ';
-	    if ($metadatafields{'obsolete'}) {
-		$scrout.=' checked="1" ';
-	    }
-	    $scrout.='/ ></p>'.
-		&textfield('Suggested Replacement for Obsolete File',
-				    'obsoletereplacement',
-				    $metadatafields{'obsoletereplacement'});
 	} else {
-	    $scrout.=&hiddenfield('copyright','private');
+	    $intr_scrout.=&selectbox('Copyright/Distribution','copyright',
+				     $defaultoption,
+				     \&Apache::loncommon::copyrightdescription,
+				     (&Apache::loncommon::copyrightids));
+	}
+	my $copyright_help =
+	    Apache::loncommon::help_open_topic('Publishing_Copyright');
+	$intr_scrout =~ s/DISTRIBUTION:/'DISTRIBUTION: ' . $copyright_help/ge;
+	$intr_scrout.=&text_with_browse_field('Custom Distribution File','customdistributionfile',$metadatafields{'customdistributionfile'},'rights').$copyright_help;
+	$intr_scrout.=&selectbox('Source Distribution','sourceavail',
+				 $defaultsourceoption,
+				 \&Apache::loncommon::source_copyrightdescription,
+				 (&Apache::loncommon::source_copyrightids));
+	$intr_scrout.=&text_with_browse_field('Source Custom Distribution File','sourcerights',$metadatafields{'sourcerights'},'rights');
+	my $uctitle=&mt('Obsolete');
+	$intr_scrout.=
+	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
+	    '</b></font> <input type="checkbox" name="obsolete" ';
+	if ($metadatafields{'obsolete'}) {
+	    $intr_scrout.=' checked="1" ';
 	}
-	return ($scrout.'<p><input type="submit" value="'.
-		&mt('Finalize Publication').'" /></p></form>',0);
-# =============================================================================
-# BATCH MODE
-#
+	$intr_scrout.='/ ></p>'.
+	    &text_with_browse_field('Suggested Replacement for Obsolete File',
+				    'obsoletereplacement',
+				    $metadatafields{'obsoletereplacement'});
     } else {
-# Transfer metadata directly to environment for stage 2
-	foreach (keys %metadatafields) {
-	    $ENV{'form.'.$_}=$metadatafields{$_};
-	}
-	$ENV{'form.addkey'}='';
-	$ENV{'form.keywords'}='';
-	foreach (keys %keywords) {
-	    if ($metadatafields{'keywords'}) {
-		if ($metadatafields{'keywords'}=~/\Q$_\E/) { 
-		    $ENV{'form.keywords'}.=$_.','; 
-		}
-	    } elsif (&Apache::loncommon::keyword($_)) {
-		$ENV{'form.keywords'}.=$_.',';
-	    }
-	}
-	$ENV{'form.keywords'}=~s/\,$//;
-	unless ($ENV{'form.creationdate'}) { $ENV{'form.creationdate'}=time; }
-	$ENV{'form.lastrevisiondate'}=time;
-	if ((($style eq 'rat') && ($ENV{'form.copyright'} eq 'public')) ||
-	    (!$ENV{'form.copyright'})) { 
-	    $ENV{'form.copyright'}='default';
-	}
-	$ENV{'form.allmeta'}=&Apache::lonnet::escape($allmeta);
-	return ($scrout,0);
+	$intr_scrout.=&hiddenfield('copyright','private');
+    }
+    if (!$batch) {
+	$scrout.=$intr_scrout.'<p><input type="submit" value="'.
+	    &mt('Finalize Publication').'" /></p></form>';
     }
+    return($scrout,0);
 }
 
 #########################################
@@ -1346,7 +1376,7 @@ sub phasetwo {
     
     %metadatafields=();
     %metadatakeys=();
-    
+
     &metaeval(&Apache::lonnet::unescape($ENV{'form.allmeta'}));
     
     $metadatafields{'title'}=$ENV{'form.title'};
@@ -1365,6 +1395,7 @@ sub phasetwo {
     $metadatafields{'highestgradelevel'}=$ENV{'form.highestgradelevel'};
     $metadatafields{'customdistributionfile'}=
                                  $ENV{'form.customdistributionfile'};
+    $metadatafields{'sourceavail'}=$ENV{'form.sourceavail'};
     $metadatafields{'obsolete'}=$ENV{'form.obsolete'};
     $metadatafields{'obsoletereplacement'}=
 	                        $ENV{'form.obsoletereplacement'};
@@ -1381,8 +1412,11 @@ sub phasetwo {
             $allkeywords .= ','.$ENV{'form.keywords'};
         }
     }
-    $allkeywords=~s/\W+/\,/;
-    $allkeywords=~s/^\,//;
+    $allkeywords=~s/[\"\']//g;
+    $allkeywords=~s/\s*[\;\,]\s*/\,/g;
+    $allkeywords=~s/\s+/ /g;
+    $allkeywords=~s/^[ \,]//;
+    $allkeywords=~s/[ \,]$//;
     $metadatafields{'keywords'}=$allkeywords;
     
 # check if custom distribution file is specified
@@ -1415,7 +1449,7 @@ sub phasetwo {
                     print $mfh ' '.$_.'="'.$value.'"';
                 }
                 print $mfh '>'.
-                    &HTML::Entities::encode($metadatafields{$unikey})
+                    &HTML::Entities::encode($metadatafields{$unikey},'<>&"')
                         .'</'.$tag.'>';
             }
         }
@@ -1436,7 +1470,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) {
@@ -1537,41 +1574,12 @@ sub phasetwo {
             "<font color=\"red\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</font>";
     }
     $r->rflush;
-# --------------------------------------------------- Send update notifications
-
-    my @subscribed=&get_subscribed_hosts($target);
-    foreach my $subhost (@subscribed) {
-	$r->print('<p>'.&mt('Notifying host').' '.$subhost.':');$r->rflush;
-	print $logfile "\nNotifying host ".$subhost.':';
-	my $reply=&Apache::lonnet::critical('update:'.$target,$subhost);
-	$r->print($reply.'</p><br />');$r->rflush;
-	print $logfile $reply;
-    }
-    
-# ---------------------------------------- Send update notifications, meta only
 
-    my @subscribedmeta=&get_subscribed_hosts("$target.meta");
-    foreach my $subhost (@subscribedmeta) {
-	$r->print('<p>'.
-&mt('Notifying host for metadata only').' '.$subhost.':');$r->rflush;
-	print $logfile "\nNotifying host for metadata only ".$subhost.':';
-	my $reply=&Apache::lonnet::critical('update:'.$target.'.meta',
-					    $subhost);
-	$r->print($reply.'</p><br />');$r->rflush;
-	print $logfile $reply;
-    }
-    
-# --------------------------------------------------- Notify subscribed courses
-    my %courses=&coursedependencies($target);
-    my $now=time;
-    foreach (keys %courses) {
-	$r->print('<p>'.&mt('Notifying course').' '.$_.':');$r->rflush;
-	print $logfile "\nNotifying host ".$_.':';
-        my ($cdom,$cname)=split(/\_/,$_);
-	my $reply=&Apache::lonnet::cput
-                  ('versionupdate',{$target => $now},$cdom,$cname);
-	$r->print($reply.'</p><br />');$r->rflush;
-	print $logfile $reply;
+# ------------------------------------------------------------- Trigger updates
+    push(@{$modified_urls},[$target,$source]);
+    unless ($registered_cleanup) {
+	$r->register_cleanup(\&notify);
+	$registered_cleanup=1;
     }
 # ------------------------------------------------ Provide link to new resource
     unless ($batch) {
@@ -1594,9 +1602,47 @@ sub phasetwo {
                    '"><font size="+2">'.
 		  &mt('Back to Source Directory').'</font></a></p>');
     }
+    $logfile->close();
     return '<p><font color="green">'.&mt('Done').'</font></p>';
 }
 
+# =============================================================== Notifications
+sub notify {  
+# --------------------------------------------------- Send update notifications
+    foreach my $targetsource (@{$modified_urls}){
+	my ($target,$source)=@{$targetsource};
+	my $logfile=Apache::File->new('>>'.$source.'.log');
+	print $logfile "\nCleanup phase: Notifications\n";
+	my @subscribed=&get_subscribed_hosts($target);
+	foreach my $subhost (@subscribed) {
+	    print $logfile "\nNotifying host ".$subhost.':';
+	    my $reply=&Apache::lonnet::critical('update:'.$target,$subhost);
+	    print $logfile $reply;
+	}
+# ---------------------------------------- Send update notifications, meta only
+	my @subscribedmeta=&get_subscribed_hosts("$target.meta");
+	foreach my $subhost (@subscribedmeta) {
+	    print $logfile "\nNotifying host for metadata only ".$subhost.':';
+	    my $reply=&Apache::lonnet::critical('update:'.$target.'.meta',
+						$subhost);
+	    print $logfile $reply;
+	} 
+# --------------------------------------------------- Notify subscribed courses
+	my %courses=&coursedependencies($target);
+	my $now=time;
+	foreach (keys %courses) {
+	    print $logfile "\nNotifying course ".$_.':';
+	    my ($cdom,$cname)=split(/\_/,$_);
+	    my $reply=&Apache::lonnet::cput
+		('versionupdate',{$target => $now},$cdom,$cname);
+	    print $logfile $reply;
+	}
+	print $logfile "\n============ Done ============\n";
+	$logfile->close();
+    }
+    return OK;
+}
+
 #########################################
 
 sub batchpublish {
@@ -1677,7 +1723,7 @@ sub publishdirectory {
 		    $ruid,$rgid,$rrdev,$rsize,
 		    $ratime,$rmtime,$rctime,
 		    $rblksize,$rblocks)=stat($resdir.'/'.$filename);
-	        if (($rmtime<$cmtime) || ($ENV{'form.forcerepub'})) {
+	        if (($rmtime<$cmtime) || ($ENV{'form.forcerepub'} eq 'ON')) {
 # previously published, modified now
 		    $publishthis=1;
                 }
@@ -1695,6 +1741,63 @@ sub publishdirectory {
     }
     closedir(DIR);
 }
+
+#########################################
+# publish a default.meta file
+
+sub defaultmetapublish {
+    my ($r,$fn,$cuname,$cudom)=@_;
+    $fn=~s/^\/\~$cuname\//\/home\/$cuname\/public_html\//;
+    unless (-e $fn) {
+       return HTTP_NOT_FOUND;
+    }
+    my $target=$fn;
+    $target=~s/^\/home\/$cuname\/public_html\//$Apache::lonnet::perlvar{'lonDocRoot'}\/res\/$cudom\/$cuname\//;
+
+
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
+
+    $r->print('<html><head><title>LON-CAPA Publishing</title></head>');
+    $r->print(&Apache::loncommon::bodytag('Catalog Information Publication'));
+
+# ---------------------------------------------------------------- Write Source
+    my $copyfile=$target;
+    
+    my @parts=split(/\//,$copyfile);
+    my $path="/$parts[1]/$parts[2]/$parts[3]/$parts[4]";
+    
+    my $count;
+    for ($count=5;$count<$#parts;$count++) {
+        $path.="/$parts[$count]";
+        if ((-e $path)!=1) {
+            $r->print('<p>'.&mt('Created directory').' '.$parts[$count].'</p>');
+            mkdir($path,0777);
+        }
+    }
+    
+    if (copy($fn,$copyfile)) {
+        $r->print('<p>'.&mt('Copied source file').'</p>');
+    } else {
+        return "<font color=\"red\">".
+	    &mt('Failed to copy source').", $!, ".&mt('FAIL')."</font>";
+    }
+
+# --------------------------------------------------- Send update notifications
+
+    my @subscribed=&get_subscribed_hosts($target);
+    foreach my $subhost (@subscribed) {
+	$r->print('<p>'.&mt('Notifying host').' '.$subhost.':');$r->rflush;
+	my $reply=&Apache::lonnet::critical('update:'.$target,$subhost);
+	$r->print($reply.'</p><br />');$r->rflush;
+    }
+# ------------------------------------------------------------------- Link back
+    my $link=$fn;
+    $link=~s/^\/home\/$cuname\/public_html\//\/priv\/$cuname\//;
+    $r->print("<a href='$link'>".&mt('Back to Catalog Information').'</a>');
+    $r->print('</body></html>');
+    return OK;
+}
 #########################################
 
 =pod
@@ -1749,10 +1852,21 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['filename']);
 
+# -------------------------------------- Flag and buffer for registered cleanup
+    $registered_cleanup=0;
+    @{$modified_urls}=();
 # -------------------------------------------------------------- Check filename
 
     my $fn=&Apache::lonnet::unescape($ENV{'form.filename'});
 
+    ($cuname,$cudom)=
+	&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
+
+# special publication: default.meta file
+    if ($fn=~/\/default.meta$/) {
+	return &defaultmetapublish($r,$fn,$cuname,$cudom); 
+    }
+    $fn=~s/\.meta$//;
   
     unless ($fn) { 
 	$r->log_reason($cuname.' at '.$cudom.
@@ -1760,8 +1874,6 @@ sub handler {
 	return HTTP_NOT_FOUND;
     } 
 
-    ($cuname,$cudom)=
-	&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
     unless (($cuname) && ($cudom)) {
 	$r->log_reason($cuname.' at '.$cudom.
 		       ' trying to publish file '.$ENV{'form.filename'}.
@@ -1770,12 +1882,14 @@ sub handler {
 	return HTTP_NOT_ACCEPTABLE;
     }
 
-    unless (&Apache::lonnet::homeserver($cuname,$cudom) 
-	    eq $r->dir_config('lonHostID')) {
+    my $home=&Apache::lonnet::homeserver($cuname,$cudom);
+    my $allowed=0;
+    my @ids=&Apache::lonnet::current_machine_ids();
+    foreach my $id (@ids) { if ($id eq $home) { $allowed = 1; }  }
+    unless ($allowed) {
 	$r->log_reason($cuname.' at '.$cudom.
 		       ' trying to publish file '.$ENV{'form.filename'}.
-		       ' ('.$fn.') - not homeserver ('.
-		       &Apache::lonnet::homeserver($cuname,$cudom).')', 
+		       ' ('.$fn.') - not homeserver ('.$home.')', 
 		       $r->filename); 
 	return HTTP_NOT_ACCEPTABLE;
     }
@@ -1834,8 +1948,11 @@ sub handler {
 
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
-
-    $r->print('<html><head><title>LON-CAPA Publishing</title></head>');
+    
+    my $js=&Apache::loncommon::browser_and_searcher_javascript();
+    $r->print('<html><head><title>LON-CAPA Publishing</title>
+              <script type="text/javascript">'.$js.'
+              </script></head>');
     $r->print(&Apache::loncommon::bodytag('Resource Publication'));
 
 
@@ -1891,6 +2008,8 @@ ENDDIFF
 # ------------------ Publishing from $thisfn to $thistarget with $thisembstyle.
 
 	unless ($ENV{'form.phase'} eq 'two') {
+# ---------------------------------------------------------- Parse for problems
+	    &checkonthis($r,$thisfn);
 	    my ($outstring,$error)=&publish($thisfn,$thistarget,$thisembstyle);
 	    $r->print('<hr />'.$outstring);
 	} else {