--- loncom/publisher/lonpublisher.pm	2004/10/11 17:40:46	1.180
+++ 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.180 2004/10/11 17:40:46 albertel Exp $
+# $Id: lonpublisher.pm,v 1.185 2005/02/28 21:28:18 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -138,6 +138,9 @@ my $docroot;
 my $cuname;
 my $cudom;
 
+my $registered_cleanup;
+my $modified_urls;
+
 =pod
 
 =item B<metaeval>
@@ -839,6 +842,35 @@ sub store_metadata {
 }
 
 
+# ========================================== 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 
@@ -1004,6 +1036,7 @@ sub publish {
             $scrout.=&metaread($logfile,$currentpath.'default.meta',$prefix);
 	    $prefix=~s|^\.\./||;
         }
+
 # ----------------------------------------------------------- Parse file itself
 # read %metadatafields from file itself
  
@@ -1541,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) {
@@ -1598,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 {
@@ -1681,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;
                 }
@@ -1810,6 +1852,9 @@ 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'});
@@ -1963,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 {