--- loncom/publisher/lonpublisher.pm	2000/12/04 15:39:28	1.13
+++ loncom/publisher/lonpublisher.pm	2001/04/03 11:26:02	1.23
@@ -5,7 +5,9 @@
 #
 # 05/29/00,05/30,10/11 Gerd Kortemeyer)
 #
-# 11/28,11/29,11/30,12/01,12/02,12/04 Gerd Kortemeyer
+# 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer
+# 03/23 Guy Albertelli
+# 03/24,03/29,04/03 Gerd Kortemeyer
 
 package Apache::lonpublisher;
 
@@ -15,9 +17,7 @@ use File::Copy;
 use Apache::Constants qw(:common :http :methods);
 use HTML::TokeParser;
 use Apache::lonxml;
-use Apache::structuretags;
-use Apache::inputtags;
-use Apache::response;
+use Apache::lonhomework;
 
 my %addid;
 my %nokey;
@@ -115,6 +115,8 @@ sub publish {
     my ($source,$target,$style)=@_;
     my $logfile;
     my $scrout='';
+    my $allmeta='';
+    my $content='';
 
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
 	return 
@@ -138,7 +140,7 @@ sub publish {
 
         my $maxindex=10;
         my $maxid=10;
-        my $content='';
+
         my $needsfixup=0;
 
         {
@@ -290,7 +292,7 @@ sub publish {
 
 # -------------------------------------------------- Parse content for metadata
 
-        my $allmeta=Apache::lonxml::xmlparse('meta',$content);
+        $allmeta=Apache::lonxml::xmlparse('meta',$content);
         &metaeval($allmeta);
 
 # ---------------- Find and document discrepancies in the parameters and stores
@@ -324,7 +326,7 @@ sub publish {
 	    $scrout.='<p><b>Obsolete parameters or stored values:</b> '.
                      $chparms;
         }
-
+    }
 # ------------------------------------------------------- Now have all metadata
 
         $scrout.=
@@ -408,7 +410,6 @@ sub publish {
         $scrout.=&selectbox('Copyright/Distribution','copyright',
                             $metadatafields{'copyright'},%cprtag);
 
-    }
     return $scrout.
       '<p><input type="submit" value="Finalize Publication"></form>';
 }
@@ -520,12 +521,14 @@ if (-e $target) {
 	$copyfile=$copyfile.'.meta';
 
         if (copy($target.'.meta',$copyfile)) {
-	    print $logfile "Copied old target  metadata to ".$copyfile."\n";
+	    print $logfile "Copied old target metadata to ".$copyfile."\n";
             $scrout.='<p>Copied old metadata';
         } else {
 	    print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
-            return 
+            if (-e $target.'.meta') {
+               return 
        "<font color=red>Failed to write old metadata copy, $!, FAIL</font>";
+	    }
         }
 
 
@@ -596,13 +599,52 @@ if (-e $target) {
 
 }
 
+# ---------------------------------------- Send update notifications, meta only
+
+{
+
+    my $filename;
+ 
+    $target=~/(.*)\/([^\/]+)$/;
+    my $srcf=$2.'.meta';
+    opendir(DIR,$1);
+    while ($filename=readdir(DIR)) {
+       if ($filename=~/$srcf\.(\w+)$/) {
+	   my $subhost=$1;
+           if ($subhost ne 'meta') {
+	       $scrout.=
+                '<p>Notifying host for metadata only '.$subhost.':';
+               print $logfile 
+                "\nNotifying host for metadata only '.$subhost.':'";
+               my $reply=&Apache::lonnet::critical(
+                                'update:'.$target.'.meta',$subhost);
+               $scrout.=$reply;
+               print $logfile $reply;              
+           }
+       }
+    }
+    closedir(DIR);
+
+}
+
 # ------------------------------------------------ Provide link to new resource
 
     my $thisdistarget=$target;
     $thisdistarget=~s/^$docroot//;
 
+    my $thissrc=$source;
+    $thissrc=~s/^\/home\/(\w+)\/public_html/\/priv\/$1/;
+
+    my $thissrcdir=$thissrc;
+    $thissrcdir=~s/\/[^\/]+$/\//;
+
+
     return $scrout.
-	'<p><a href="'.$thisdistarget.'"><font size=+2>View Target</font></a>';
+      '<hr><a href="'.$thisdistarget.'"><font size=+2>View Target</font></a>'.
+      '<p><a href="'.$thissrc.'"><font size=+2>Back to Source</font></a>'.
+      '<p><a href="'.$thissrcdir.
+      '"><font size=+2>Back to Source Directory</font></a>';
+
 }
 
 # ================================================================ Main Handler
@@ -709,7 +751,8 @@ unless ($ENV{'form.phase'} eq 'two') {
   $r->send_http_header;
 
   $r->print('<html><head><title>LON-CAPA Publishing</title></head>');
-  $r->print('<body bgcolor="#FFFFFF">');
+  $r->print(
+   '<body bgcolor="#FFFFFF"><img align=right src=/adm/lonIcons/lonlogos.gif>');
   my $thisfn=$fn;
    
 # ------------------------------------------------------------- Individual file