--- loncom/publisher/lonpublisher.pm	2005/01/05 20:11:19	1.181
+++ loncom/publisher/lonpublisher.pm	2005/03/03 21:14:10	1.186
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.181 2005/01/05 20:11:19 www Exp $
+# $Id: lonpublisher.pm,v 1.186 2005/03/03 21:14:10 albertel 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>
@@ -545,7 +548,8 @@ sub get_max_ids_indices {
 	    my $counter;
 	    if ($counter=$addid{$token->[1]}) {
 		if ($counter eq 'id') {
-		    if (defined($token->[2]->{'id'})) {
+		    if (defined($token->[2]->{'id'}) &&
+			$token->[2]->{'id'} !~ /^\s*$/) {
 			$maxid=($token->[2]->{'id'}>$maxid)?$token->[2]->{'id'}:$maxid;
 			if (exists($allids{$token->[2]->{'id'}})) {
 			    $duplicateids=1;
@@ -557,7 +561,8 @@ sub get_max_ids_indices {
 			$needsfixup=1;
 		    }
 		} else {
-		    if (defined($token->[2]->{'index'})) {
+		    if (defined($token->[2]->{'index'}) &&
+			$token->[2]->{'index'} !~ /^\s*$/) {
 			$maxindex=($token->[2]->{'index'}>$maxindex)?$token->[2]->{'index'}:$maxindex;
 		    } else {
 			$needsfixup=1;
@@ -671,13 +676,15 @@ sub fix_ids_and_indices {
 		if (!$counter) { $counter=$addid{$lctag}; }
 		if ($counter) {
 		    if ($counter eq 'id') {
-			unless (defined($parms{'id'})) {
+			unless (defined($parms{'id'}) &&
+				$parms{'id'}!~/^\s*$/) {
 			    $maxid++;
 			    $parms{'id'}=$maxid;
 			    print $logfile 'ID: '.$tag.':'.$maxid."\n";
 			}
 		    } elsif ($counter eq 'index') {
-			unless (defined($parms{'index'})) {
+			unless (defined($parms{'index'}) &&
+				$parms{'index'}!~/^\s*$/) {
 			    $maxindex++;
 			    $parms{'index'}=$maxindex;
 			    print $logfile 'Index: '.$tag.':'.$maxindex."\n";
@@ -839,6 +846,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 +1040,7 @@ sub publish {
             $scrout.=&metaread($logfile,$currentpath.'default.meta',$prefix);
 	    $prefix=~s|^\.\./||;
         }
+
 # ----------------------------------------------------------- Parse file itself
 # read %metadatafields from file itself
  
@@ -1543,10 +1580,11 @@ sub phasetwo {
     $r->rflush;
 
 # ------------------------------------------------------------- Trigger updates
-    $ENV{'internal.publication.target'}=$target;
-    $ENV{'internal.publication.source'}=$source;
-    $r->register_cleanup(\&notify);
-
+    push(@{$modified_urls},[$target,$source]);
+    unless ($registered_cleanup) {
+	$r->register_cleanup(\&notify);
+	$registered_cleanup=1;
+    }
 # ------------------------------------------------ Provide link to new resource
     unless ($batch) {
         my $thisdistarget=$target;
@@ -1575,36 +1613,38 @@ sub phasetwo {
 # =============================================================== Notifications
 sub notify {  
 # --------------------------------------------------- Send update notifications
-    my $target=$ENV{'internal.publication.target'};
-    my $source=$ENV{'internal.publication.source'};
-    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;
-    }
+    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;
-    } 
+	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;
+	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();
     }
-    print $logfile "\n============ Done ============\n";
-    $logfile->close();
+    return OK;
 }
 
 #########################################
@@ -1687,7 +1727,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;
                 }
@@ -1816,6 +1856,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'});
@@ -1969,6 +2012,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 {