--- loncom/publisher/lonpublisher.pm	2003/07/05 10:07:12	1.124
+++ loncom/publisher/lonpublisher.pm	2003/08/13 18:41:59	1.128
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.124 2003/07/05 10:07:12 www Exp $
+# $Id: lonpublisher.pm,v 1.128 2003/08/13 18:41:59 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -82,6 +82,26 @@ invocation by F<loncapa_apache.conf>:
   ErrorDocument     500 /adm/errorhandler
   </Location>
 
+=head1 OVERVIEW
+
+Authors can only write-access the C</~authorname/> space. They can
+copy resources into the resource area through the publication step,
+and move them back through a recover step. Authors do not have direct
+write-access to their resource space.
+
+During the publication step, several events will be
+triggered. Metadata is gathered, where a wizard manages default
+entries on a hierarchical per-directory base: The wizard imports the
+metadata (including access privileges and royalty information) from
+the most recent published resource in the current directory, and if
+that is not available, from the next directory above, etc. The Network
+keeps all previous versions of a resource and makes them available by
+an explicit version number, which is inserted between the file name
+and extension, for example C<foo.2.html>, while the most recent
+version does not carry a version number (C<foo.html>). Servers
+subscribing to a changed resource are notified that a new version is
+available.
+
 =head1 DESCRIPTION
 
 B<lonpublisher> takes the proper steps to add resources to the LON-CAPA
@@ -815,7 +835,7 @@ sub publish {
 	return ('<font color="red">No write permission to user directory, FAIL</font>',1);
     }
     print $logfile 
-"\n\n================= Publish ".localtime()." Phase One  ================\n";
+"\n\n================= Publish ".localtime()." Phase One  ================\n".$ENV{'user.name'}.'@'.$ENV{'user.domain'}."\n";
 
     if (($style eq 'ssi') || ($style eq 'rat') || ($style eq 'prv')) {
 # ------------------------------------------------------- This needs processing
@@ -910,6 +930,9 @@ sub publish {
         $metadatafields{'author'}=~s/\s+/ /g;
         $metadatafields{'author'}=~s/\s+$//;
         $metadatafields{'owner'}=$cuname.'@'.$cudom;
+	$metadatafields{'modifyinguser'}=$ENV{'user.name'}.'@'.
+	                                 $ENV{'user.domain'};
+	$metadatafields{'authorspace'}=$cuname.'@'.$cudom;
 
 # ------------------------------------------------ Check out directory hierachy
 
@@ -1231,7 +1254,7 @@ sub phasetwo {
         return 0;
     }
     print $logfile 
-        "\n================= Publish ".localtime()." Phase Two  ================\n";
+        "\n================= Publish ".localtime()." Phase Two  ================\n".$ENV{'user.name'}.'@'.$ENV{'user.domain'}."\n";
     
     %metadatafields=();
     %metadatakeys=();
@@ -1338,7 +1361,7 @@ sub phasetwo {
         closedir(DIR);
         $maxversion++;
         $r->print('<p>Creating old version '.$maxversion.'</p>');
-        print $logfile "\nCreating old version ".$maxversion;
+        print $logfile "\nCreating old version ".$maxversion."\n";
         
         my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct;
         
@@ -1721,6 +1744,10 @@ unless ($ENV{'form.phase'} eq 'two') {
   if ($fn=~/\/$/) {
 # -------------------------------------------------------- This is a directory
       &publishdirectory($r,$fn,$thisdisfn);
+      $r->print('<hr><font size="+2">Done</font><br><a href="/priv/'
+		.$cuname.'/'.$thisdisfn
+		.'">Return to Directory</a>');
+
 
   } else {
 # ---------------------- Evaluate individual file, and then output information.
@@ -1766,5 +1793,7 @@ __END__
 
 =back
 
+=back
+
 =cut