--- loncom/publisher/lonpublisher.pm	2002/10/07 21:07:08	1.100
+++ loncom/publisher/lonpublisher.pm	2002/10/19 06:34:15	1.104
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.100 2002/10/07 21:07:08 matthew Exp $
+# $Id: lonpublisher.pm,v 1.104 2002/10/19 06:34:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -139,9 +139,6 @@ my $docroot;
 my $cuname;
 my $cudom;
 
-#########################################
-#########################################
-
 =pod
 
 =item B<metaeval>
@@ -265,50 +262,31 @@ sub metaread {
 }
 
 #########################################
-#########################################
-
-=pod
-
-=item B<sqltime>
-
-Convert 'time' format into a datetime sql format
-
-Parameters:
-
-=over 4
-
-=item I<$timef>
-
-Seconds since 00:00:00 UTC, January 1, 1970.
-
-=back
-
-Returns:
-
-=over 4
-
-=item Scalar string
-
-MySQL-compatible datetime string.
-
-=back
-
-=cut
 
 #########################################
 #########################################
-sub sqltime {
-    my $timef=shift @_;
-    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
-	localtime($timef);
-    $mon++; $year+=1900;
-    return "$year-$mon-$mday $hour:$min:$sec";
-}
-
 
+sub coursedependencies {
+    my $url=&Apache::lonnet::declutter(shift);
+    $url=~s/\.meta$//;
+    my ($adomain,$aauthor)=($url=~/^(\w+)\/(\w+)\//);
+    my $regexp=$url;
+    $regexp=~s/(\W)/\\$1/g;
+    $regexp='___'.$regexp.'___course';
+    my %evaldata=&Apache::lonnet::dump('nohist_resevaldata',$adomain,
+				       $aauthor,$regexp);
+    my %courses=();
+    foreach (keys %evaldata) {
+	if ($_=~/^([a-zA-Z0-9]+_[a-zA-Z0-9]+)___.+___course$/) {
+	    $courses{$1}=1;
+        }
+    }
+    return %courses;
+}
 #########################################
 #########################################
 
+
 =pod
 
 =item Form-field-generating subroutines.
@@ -492,7 +470,6 @@ sub get_subscribed_hosts {
     } else {
 	&Apache::lonnet::logthis("Unable to open $target.subscription");
     }
-    &Apache::lonnet::logthis("Got list of ".join(':',@subscribed));
     return @subscribed;
 }
 
@@ -1104,7 +1081,8 @@ END
         unless ($metadatafields{'creationdate'}) {
 	    $metadatafields{'creationdate'}=time;
         }
-        $scrout.=&hiddenfield('creationdate',$metadatafields{'creationdate'});
+        $scrout.=&hiddenfield('creationdate',
+              &Apache::loncommon::unsqltime($metadatafields{'creationdate'}));
 
         $scrout.=&hiddenfield('lastrevisiondate',time);
 
@@ -1206,6 +1184,9 @@ the server's attempts at publication.
 sub phasetwo {
 
     my ($r,$source,$target,$style,$distarget,$batch)=@_;
+    $source=~s/\/+/\//g;
+    $target=~s/\/+/\//g;
+    $distarget=~s/\/+/\//g;
     my $logfile;
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
 	return 
@@ -1226,10 +1207,8 @@ sub phasetwo {
     $metadatafields{'abstract'}=$ENV{'form.abstract'};
     $metadatafields{'mime'}=$ENV{'form.mime'};
     $metadatafields{'language'}=$ENV{'form.language'};
-    $metadatafields{'creationdate'}=
-        &sqltime($ENV{'form.creationdate'});
-    $metadatafields{'lastrevisiondate'}=
-        &sqltime($ENV{'form.lastrevisiondate'});
+    $metadatafields{'creationdate'}=$ENV{'form.creationdate'};
+    $metadatafields{'lastrevisiondate'}=$ENV{'form.lastrevisiondate'};
     $metadatafields{'owner'}=$ENV{'form.owner'};
     $metadatafields{'copyright'}=$ENV{'form.copyright'};
     $metadatafields{'dependencies'}=$ENV{'form.dependencies'};
@@ -1396,7 +1375,7 @@ sub phasetwo {
 	$r->print('<p>Notifying host '.$subhost.':');$r->rflush;
 	print $logfile "\nNotifying host ".$subhost.':';
 	my $reply=&Apache::lonnet::critical('update:'.$target,$subhost);
-	$r->print($reply);$r->rflush;
+	$r->print($reply.'<br />');$r->rflush;
 	print $logfile $reply;
     }
     
@@ -1408,10 +1387,22 @@ sub phasetwo {
 	print $logfile "\nNotifying host for metadata only ".$subhost.':';
 	my $reply=&Apache::lonnet::critical('update:'.$target.'.meta',
 					    $subhost);
-	$r->print($reply);$r->rflush;
+	$r->print($reply.'<br />');$r->rflush;
 	print $logfile $reply;
     }
     
+# --------------------------------------------------- Notify subscribed courses
+    my %courses=&coursedependencies($target);
+    my $now=time;
+    foreach (keys %courses) {
+	$r->print('<p>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.'<br />');$r->rflush;
+	print $logfile $reply;
+    }
 # ------------------------------------------------ Provide link to new resource
     unless ($batch) {
         my $thisdistarget=$target;
@@ -1437,6 +1428,8 @@ sub phasetwo {
 
 sub batchpublish {
     my ($r,$srcfile,$targetfile)=@_;
+    $srcfile=~s/\/+/\//g;
+    $targetfile=~s/\/+/\//g;
     my $thisdisfn=$srcfile;
     $thisdisfn=~s/\/home\/korte\/public_html\///;
     $srcfile=~s/\/+/\//g;
@@ -1474,6 +1467,8 @@ sub batchpublish {
 
 sub publishdirectory {
     my ($r,$fn,$thisdisfn)=@_;
+    $fn=~s/\/+/\//g;
+    $thisdisfn=~s/\/+/\//g;
     my $resdir=
     $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cudom.'/'.$cuname.'/'.
       $thisdisfn;
@@ -1665,6 +1660,8 @@ unless ($ENV{'form.phase'} eq 'two') {
 
   $r->print('<html><head><title>LON-CAPA Publishing</title></head>');
   $r->print(&Apache::loncommon::bodytag('Resource Publication'));
+
+
   my $thisfn=$fn;
 
   my $thistarget=$thisfn;
@@ -1701,7 +1698,7 @@ unless ($ENV{'form.phase'} eq 'two') {
       if (&Apache::loncommon::fileembstyle($thistype) eq 'ssi') {
           $r->print('<br /><a href="/adm/diff?filename=/~'.$cuname.'/'.
                     $thisdisfn.
-  	  '&versionone=priv" target="cat">Diffs with Current Version</a><p>');
+  	  '&versiontwo=priv" target="cat">Diffs with Current Version</a><p>');
       }
   
 # ------------------ Publishing from $thisfn to $thistarget with $thisembstyle.