--- loncom/publisher/lonpublisher.pm	2002/08/09 17:57:48	1.89
+++ loncom/publisher/lonpublisher.pm	2004/04/14 18:29:32	1.166
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.89 2002/08/09 17:57:48 matthew Exp $
+# $Id: lonpublisher.pm,v 1.166 2004/04/14 18:29:32 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,28 +25,6 @@
 #
 # http://www.lon-capa.org/
 #
-# 
-# (TeX Content Handler
-#
-# 05/29/00,05/30,10/11 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
-# 04/16/2001 Scott Harrison
-# 05/03,05/05,05/07 Gerd Kortemeyer
-# 05/28/2001 Scott Harrison
-# 06/23,08/07,08/11,8/13,8/17,8/18,8/24,9/26,10/16 Gerd Kortemeyer
-# 12/04,12/05 Guy Albertelli
-# 12/05 Gerd Kortemeyer
-# 12/05 Guy Albertelli
-# 12/06,12/07 Gerd Kortemeyer
-# 12/15,12/16 Scott Harrison
-# 12/25 Gerd Kortemeyer
-# YEAR=2002
-# 1/16,1/17 Scott Harrison
-# 1/17 Gerd Kortemeyer
-#
 ###
 
 ###############################################################################
@@ -61,6 +39,77 @@
 ##                                                                           ##
 ###############################################################################
 
+
+######################################################################
+######################################################################
+
+=pod 
+
+=head1 NAME
+
+lonpublisher - LON-CAPA publishing handler
+
+=head1 SYNOPSIS
+
+B<lonpublisher> is used by B<mod_perl> inside B<Apache>.  This is the
+invocation by F<loncapa_apache.conf>:
+
+  <Location /adm/publish>
+  PerlAccessHandler       Apache::lonacc
+  SetHandler perl-script
+  PerlHandler Apache::lonpublisher
+  ErrorDocument     403 /adm/login
+  ErrorDocument     404 /adm/notfound.html
+  ErrorDocument     406 /adm/unauthorized.html
+  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
+digital library.  This includes updating the metadata table in the
+LON-CAPA database.
+
+B<lonpublisher> is many things to many people.  
+
+This module publishes a file.  This involves gathering metadata,
+versioning the file, copying file from construction space to
+publication space, and copying metadata from construction space
+to publication space.
+
+=head2 SUBROUTINES
+
+Many of the undocumented subroutines implement various magical
+parsing shortcuts.
+
+=over 4
+
+=cut
+
+######################################################################
+######################################################################
+
+
 package Apache::lonpublisher;
 
 # ------------------------------------------------- modules used by this module
@@ -70,111 +119,225 @@ use File::Copy;
 use Apache::Constants qw(:common :http :methods);
 use HTML::LCParser;
 use Apache::lonxml;
-use Apache::lonhomework;
 use Apache::loncacc;
 use DBI;
 use Apache::lonnet();
 use Apache::loncommon();
 use Apache::lonmysql;
+use Apache::lonlocal;
+use Apache::loncfile;
+use LONCAPA::lonmetadata;
+use Apache::lonmsg;
+use vars qw(%metadatafields %metadatakeys);
 
 my %addid;
 my %nokey;
 
-my %metadatafields;
-my %metadatakeys;
-
 my $docroot;
 
 my $cuname;
 my $cudom;
 
-# ----------------------------------------------- Evaluate string with metadata
+=pod
+
+=item B<metaeval>
+
+Evaluates a string that contains metadata.  This subroutine
+stores values inside I<%metadatafields> and I<%metadatakeys>.
+The hash key is a I<$unikey> corresponding to a unique id
+that is descriptive of the parser location inside the XML tree.
+
+Parameters:
+
+=over 4
+
+=item I<$metastring>
+
+A string that contains metadata.
+
+=back
+
+Returns:
+
+nothing
+
+=cut
+
+#########################################
+#########################################
+#
+# Modifies global %metadatafields %metadatakeys 
+#
+
 sub metaeval {
-    my $metastring=shift;
+    my ($metastring,$prefix)=@_;
    
-        my $parser=HTML::LCParser->new(\$metastring);
-        my $token;
-        while ($token=$parser->get_token) {
-           if ($token->[0] eq 'S') {
-	      my $entry=$token->[1];
-              my $unikey=$entry;
-              if (defined($token->[2]->{'package'})) { 
-                  $unikey.='_package_'.$token->[2]->{'package'};
-              } 
-              if (defined($token->[2]->{'part'})) { 
-                 $unikey.='_'.$token->[2]->{'part'}; 
-	      }
-              if (defined($token->[2]->{'id'})) { 
-                  $unikey.='_'.$token->[2]->{'id'};
-              } 
-              if (defined($token->[2]->{'name'})) { 
-                 $unikey.='_'.$token->[2]->{'name'}; 
-	      }
-              foreach (@{$token->[3]}) {
-		  $metadatafields{$unikey.'.'.$_}=$token->[2]->{$_};
-                  if ($metadatakeys{$unikey}) {
-		      $metadatakeys{$unikey}.=','.$_;
-                  } else {
-                      $metadatakeys{$unikey}=$_;
-                  }
-              }
-              if ($metadatafields{$unikey}) {
-		  my $newentry=$parser->get_text('/'.$entry);
-                  unless (($metadatafields{$unikey}=~/$newentry/) ||
-                          ($newentry eq '')) {
-                     $metadatafields{$unikey}.=', '.$newentry;
-		  }
-	      } else {
-                 $metadatafields{$unikey}=$parser->get_text('/'.$entry);
-              }
-          }
-       }
+    my $parser=HTML::LCParser->new(\$metastring);
+    my $token;
+    while ($token=$parser->get_token) {
+	if ($token->[0] eq 'S') {
+	    my $entry=$token->[1];
+	    my $unikey=$entry;
+	    if (defined($token->[2]->{'package'})) { 
+		$unikey.='_package_'.$token->[2]->{'package'};
+	    } 
+	    if (defined($token->[2]->{'part'})) { 
+		$unikey.='_'.$token->[2]->{'part'}; 
+	    }
+	    if (defined($token->[2]->{'id'})) { 
+		$unikey.='_'.$token->[2]->{'id'};
+	    } 
+	    if (defined($token->[2]->{'name'})) { 
+		$unikey.='_'.$token->[2]->{'name'}; 
+	    }
+	    foreach (@{$token->[3]}) {
+		$metadatafields{$unikey.'.'.$_}=$token->[2]->{$_};
+		if ($metadatakeys{$unikey}) {
+		    $metadatakeys{$unikey}.=','.$_;
+		} else {
+		    $metadatakeys{$unikey}=$_;
+		}
+	    }
+	    my $newentry=$parser->get_text('/'.$entry);
+	    if ($entry eq 'customdistributionfile') {
+		$newentry=~s/^\s*//;
+		if ($newentry !~m|^/res|) { $newentry=$prefix.$newentry; }
+	    }
+# actually store
+	    if ( $entry eq 'rule' && exists($metadatafields{$unikey})) {
+		$metadatafields{$unikey}.=','.$newentry;
+	    } else {
+		$metadatafields{$unikey}=$newentry;
+	    }
+	}
+    }
 }
 
-# -------------------------------------------------------- Read a metadata file
+#########################################
+#########################################
+
+=pod
+
+=item B<metaread>
+
+Read a metadata file
+
+Parameters:
+
+=over
+
+=item I<$logfile>
+
+File output stream to output errors and warnings to.
+
+=item I<$fn>
+
+File name (including path).
+
+=back
+
+Returns:
+
+=over 4
+
+=item Scalar string (if successful)
+
+XHTML text that indicates successful reading of the metadata.
+
+=back
+
+=cut
+
+#########################################
+#########################################
 sub metaread {
-    my ($logfile,$fn)=@_;
+    my ($logfile,$fn,$prefix)=@_;
     unless (-e $fn) {
-	print $logfile 'No file '.$fn."\n";
-        return '<br><b>No file:</b> <tt>'.$fn.'</tt>';
+	print($logfile 'No file '.$fn."\n");
+        return '<br /><b>'.&mt('No file').':</b> <tt>'.
+	    &Apache::loncfile::display($fn).'</tt>';
     }
-    print $logfile 'Processing '.$fn."\n";
+    print($logfile 'Processing '.$fn."\n");
     my $metastring;
     {
-     my $metafh=Apache::File->new($fn);
-     $metastring=join('',<$metafh>);
+	my $metafh=Apache::File->new($fn);
+	$metastring=join('',<$metafh>);
     }
-    &metaeval($metastring);
-    return '<br><b>Processed file:</b> <tt>'.$fn.'</tt>';
+    &metaeval($metastring,$prefix);
+    return '<br /><b>'.&mt('Processed file').':</b> <tt>'.
+	&Apache::loncfile::display($fn).'</tt>';
 }
 
-# ---------------------------- convert 'time' format into a datetime sql format
-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
 
-# --------------------------------------------------------- Various form fields
+=item Form-field-generating subroutines.
 
+For input parameters, these subroutines take in values
+such as I<$name>, I<$value> and other form field metadata.
+The output (scalar string that is returned) is an XHTML
+string which presents the form field (foreseeably inside
+<form></form> tags).
+
+=over 4
+
+=item B<textfield>
+
+=item B<hiddenfield>
+
+=item B<selectbox>
+
+=back
+
+=cut
+
+#########################################
+#########################################
 sub textfield {
     my ($title,$name,$value)=@_;
-    return "\n<p><b>$title:</b><br>".
-           '<input type=text name="'.$name.'" size=80 value="'.$value.'">';
+    $value=~s/^\s+//gs;
+    $value=~s/\s+$//gs;
+    $value=~s/\s+/ /gs;
+    $title=&mt($title);
+    return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:".
+           "</b></font></p><br />".
+           '<input type="text" name="'.$name.'" size=80 value="'.$value.'" />';
 }
 
 sub hiddenfield {
     my ($name,$value)=@_;
-    return "\n".'<input type=hidden name="'.$name.'" value="'.$value.'">';
+    return "\n".'<input type="hidden" name="'.$name.'" value="'.$value.'" />';
 }
 
 sub selectbox {
     my ($title,$name,$value,$functionref,@idlist)=@_;
-    my $uctitle=uc($title);
-    my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
-	"</b></font><br />".'<select name="'.$name.'">';
+    $title=&mt($title);
+    $value=(split(/\s*,\s*/,$value))[-1];
+    my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:".
+	'</b></font></p><br /><select name="'.$name.'">';
     foreach (@idlist) {
         $selout.='<option value=\''.$_.'\'';
         if ($_ eq $value) {
@@ -185,8 +348,19 @@ sub selectbox {
     return $selout.'</select>';
 }
 
-# -------------------------------------------------------- Publication Step One
+#########################################
+#########################################
+
+=pod
+
+=item B<urlfixup>
+
+Fix up a url?  First step of publication
+
+=cut
 
+#########################################
+#########################################
 sub urlfixup {
     my ($url,$target)=@_;
     unless ($url) { return ''; }
@@ -207,7 +381,19 @@ sub urlfixup {
     return $url;
 }
 
+#########################################
+#########################################
 
+=pod
+
+=item B<absoluteurl>
+
+Currently undocumented.
+
+=cut
+
+#########################################
+#########################################
 sub absoluteurl {
     my ($url,$target)=@_;
     unless ($url) { return ''; }
@@ -218,6 +404,19 @@ sub absoluteurl {
     return $url;
 }
 
+#########################################
+#########################################
+
+=pod
+
+=item B<set_allow>
+
+Currently undocumented    
+
+=cut
+
+#########################################
+#########################################
 sub set_allow {
     my ($allow,$logfile,$target,$tag,$oldurl)=@_;
     my $newurl=&urlfixup($oldurl,$target);
@@ -236,6 +435,19 @@ sub set_allow {
     return $return_url
 }
 
+#########################################
+#########################################
+
+=pod
+
+=item B<get_subscribed_hosts>
+
+Currently undocumented    
+
+=cut
+
+#########################################
+#########################################
 sub get_subscribed_hosts {
     my ($target)=@_;
     my @subscribed;
@@ -244,9 +456,10 @@ sub get_subscribed_hosts {
     my $srcf=$2;
     opendir(DIR,$1);
     while ($filename=readdir(DIR)) {
-	if ($filename=~/$srcf\.(\w+)$/) {
+	if ($filename=~/\Q$srcf\E\.(\w+)$/) {
 	    my $subhost=$1;
-	    if ($subhost ne 'meta' && $subhost ne 'subscription') {
+	    if (($subhost ne 'meta' && $subhost ne 'subscription') &&
+                ($subhost ne $Apache::lonnet::perlvar{'lonHostID'})) {
 		push(@subscribed,$subhost);
 	    }
 	}
@@ -257,23 +470,43 @@ sub get_subscribed_hosts {
 	&Apache::lonnet::logthis("opened $target.subscription");
 	while (my $subline=<$sh>) {
 	    &Apache::lonnet::logthis("Trying $subline");
-	    if ($subline =~ /(^\w+):/) { push(@subscribed,$1); } else {
+	    if ($subline =~ /(^\w+):/) { 
+                if ($1 ne $Apache::lonnet::perlvar{'lonHostID'}) { 
+                   push(@subscribed,$1);
+	        }
+            } else {
 		&Apache::lonnet::logthis("No Match for $subline");
 	    }
 	}
     } else {
-	&Apache::lonnet::logthis("Un able to open $target.subscription");
+	&Apache::lonnet::logthis("Unable to open $target.subscription");
     }
-    &Apache::lonnet::logthis("Got list of ".join(':',@subscribed));
     return @subscribed;
 }
 
 
+#########################################
+#########################################
+
+=pod
+
+=item B<get_max_ids_indices>
+
+Currently undocumented    
+
+=cut
+
+#########################################
+#########################################
 sub get_max_ids_indices {
     my ($content)=@_;
     my $maxindex=10;
     my $maxid=10;
     my $needsfixup=0;
+    my $duplicateids=0;
+
+    my %allids;
+    my %duplicatedids;
 
     my $parser=HTML::LCParser->new($content);
     my $token;
@@ -284,6 +517,12 @@ sub get_max_ids_indices {
 		if ($counter eq 'id') {
 		    if (defined($token->[2]->{'id'})) {
 			$maxid=($token->[2]->{'id'}>$maxid)?$token->[2]->{'id'}:$maxid;
+			if (exists($allids{$token->[2]->{'id'}})) {
+			    $duplicateids=1;
+			    $duplicatedids{$token->[2]->{'id'}}=1;
+			} else {
+			    $allids{$token->[2]->{'id'}}=1;
+			}
 		    } else {
 			$needsfixup=1;
 		    }
@@ -297,9 +536,23 @@ sub get_max_ids_indices {
 	    }
 	}
     }
-    return ($needsfixup,$maxid,$maxindex);
+    return ($needsfixup,$maxid,$maxindex,$duplicateids,
+	    (keys(%duplicatedids)));
 }
 
+#########################################
+#########################################
+
+=pod
+
+=item B<get_all_text_unbalanced>
+
+Currently undocumented    
+
+=cut
+
+#########################################
+#########################################
 sub get_all_text_unbalanced {
     #there is a copy of this in lonxml.pm
     my($tag,$pars)= @_;
@@ -316,7 +569,7 @@ sub get_all_text_unbalanced {
 	} elsif ($token->[0] eq 'E')  {
 	    $result.=$token->[2];
 	}
-	if ($result =~ /(.*)$tag(.*)/) {
+	if ($result =~ /(.*)\Q$tag\E(.*)/s) {
 	    #&Apache::lonnet::logthis('Got a winner with leftovers ::'.$2);
 	    #&Apache::lonnet::logthis('Result is :'.$1);
 	    $result=$1;
@@ -329,6 +582,19 @@ sub get_all_text_unbalanced {
     return $result
 }
 
+#########################################
+#########################################
+
+=pod
+
+=item B<fix_ids_and_indices>
+
+Currently undocumented    
+
+=cut
+
+#########################################
+#########################################
 #Arguably this should all be done as a lonnet::ssi instead
 sub fix_ids_and_indices {
     my ($logfile,$source,$target)=@_;
@@ -340,8 +606,16 @@ sub fix_ids_and_indices {
 	$content=join('',<$org>);
     }
 
-    my ($needsfixup,$maxid,$maxindex)=&get_max_ids_indices(\$content);
+    my ($needsfixup,$maxid,$maxindex,$duplicateids,@duplicatedids)=
+	&get_max_ids_indices(\$content);
 
+    print $logfile ("Got $needsfixup,$maxid,$maxindex,$duplicateids--".
+			   join(', ',@duplicatedids));
+    if ($duplicateids) {
+	print $logfile "Duplicate ID(s) exist, ".join(', ',@duplicatedids)."\n";
+	my $outstring='<font color="red">'.&mt('Unable to publish file, it contains duplicated ID(s), ID(s) need to be unique. The duplicated ID(s) are').': '.join(', ',@duplicatedids).'</font>';
+	return ($outstring,1);
+    }
     if ($needsfixup) {
 	print $logfile "Needs ID and/or index fixup\n".
 	    "Max ID   : $maxid (min 10)\n".
@@ -390,7 +664,10 @@ sub fix_ids_and_indices {
 		    }
 		}
 		# probably a <randomlabel> image type <label>
-		if ($lctag eq 'label' && defined($parms{'description'})) {
+		# or a <image> tag inside <imageresponse>
+		if (($lctag eq 'label' && defined($parms{'description'}))
+		    ||
+		    ($lctag eq 'image')) {
 		    my $next_token=$parser[-1]->get_token();
 		    if ($next_token->[0] eq 'T') {
 			$next_token->[1]=&set_allow(\%allow,$logfile,
@@ -401,8 +678,15 @@ sub fix_ids_and_indices {
 		}
 		if ($lctag eq 'applet') {
 		    my $codebase='';
-		    if (defined($parms{'codebase'})) {
-			my $oldcodebase=$parms{'codebase'};
+		    my $havecodebase=0;
+		    foreach my $key (keys(%parms)) {
+			if (lc($key) eq 'codebase') { 
+			    $codebase=$parms{$key};
+			    $havecodebase=1; 
+			}
+		    }
+		    if ($havecodebase) {
+			my $oldcodebase=$codebase;
 			unless ($oldcodebase=~/\/$/) {
 			    $oldcodebase.='/';
 			}
@@ -416,14 +700,13 @@ sub fix_ids_and_indices {
 			}
 			$allow{&absoluteurl($codebase,$target).'/*'}=1;
 		    } else {
-			foreach ('archive','code','object') {
-			    if (defined($parms{$_})) {
-				my $oldurl=$parms{$_};
+			foreach my $key (keys(%parms)) {
+			    if ($key =~ /(archive|code|object)/i) {
+				my $oldurl=$parms{$key};
 				my $newurl=&urlfixup($oldurl,$target);
 				$newurl=~s/\/[^\/]+$/\/\*/;
-				print $logfile 'Allow: applet '.$_.':'.
-				    $oldurl.' allows '.
-					$newurl."\n";
+				print $logfile 'Allow: applet '.lc($key).':'.
+				    $oldurl.' allows '.$newurl."\n";
 				$allow{&absoluteurl($newurl,$target)}=1;
 			    }
 			}
@@ -441,8 +724,9 @@ sub fix_ids_and_indices {
 		}
 		if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; }
 		$outstring.='<'.$tag.$newparmstring.$endtag.'>';
-		if ($lctag eq 'm') {
-		    $outstring.=&get_all_text_unbalanced('/m',\@parser);
+		if ($lctag eq 'm' || $lctag eq 'script' 
+                    || $lctag eq 'display' || $lctag eq 'tex') {
+		    $outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser);
 		}
 	    } elsif ($token->[0] eq 'E') {
 		if ($token->[2]) {
@@ -465,7 +749,7 @@ sub fix_ids_and_indices {
 	print $logfile "Does not need ID and/or index fixup\n";
     }
 
-    return ($outstring,%allow);
+    return ($outstring,0,%allow);
 }
 
 #########################################
@@ -473,7 +757,7 @@ sub fix_ids_and_indices {
 
 =pod
 
-=item store_metadata
+=item B<store_metadata>
 
 Store the metadata in the metadata table in the loncapa database.
 Uses lonmysql to access the database.
@@ -487,7 +771,7 @@ Returns: (error,status).  error is undef
 #########################################
 #########################################
 sub store_metadata {
-    my %metadata = %{shift()};
+    my %metadata = @_;
     my $error;
     # Determine if the table exists
     my $status = &Apache::lonmysql::check_table('metadata');
@@ -504,17 +788,45 @@ sub store_metadata {
         &Apache::lonnet::logthis($error);
         return ($error,undef);
     }
-    # Remove old value from table
-    $status = &Apache::lonmysql::remove_from_table
-        ('metadata','url',$metadata{'url'});
-    if (! defined($status)) {
-        $error = '<font color="red">Error when removing old values from '.
-            'metadata table in LON-CAPA database.</font>';
-        &Apache::lonnet::logthis($error);
-        return ($error,undef);
+    if (($metadata{'obsolete'}) || ($metadata{'copyright'} eq 'priv') ||
+	($metadata{'copyright'} eq 'custom')) {
+# remove this entry
+	$status=&Apache::lonmysql::remove_from_table
+	    ('metadata','url',$metadata{'url'});
+    } else {
+# store new data
+# adjust some values to metadatadatabase (e.g., "usage" is a reserved word)
+	$metadata{'creationdate'}=
+	    &Apache::lonmysql::sqltime($metadata{'creationdate'}); 
+	$metadata{'lastrevisiondate'}=
+	    &Apache::lonmysql::sqltime($metadata{'lastrevisiondate'});
+	$metadata{'sequsage'}=$metadata{'usage'};
+	$metadata{'sequsage_list'}=$metadata{'usage_list'};
+	my %newmetadata=();
+# see if we have old entries
+	my @oldmeta=&Apache::lonmysql::get_rows('metadata',
+						"url LIKE BINARY '".
+						$metadata{'url'}."'");
+	if ($#oldmeta==0) {
+# yes, there is one old entry, transfer to newmetadata
+	    %newmetadata=&LONCAPA::lonmetadata::metadata_col_to_hash(@{$oldmeta[0]});
+# remove old entry
+	    $status=&Apache::lonmysql::remove_from_table
+		('metadata','url',$metadata{'url'});
+	} elsif ($#oldmeta>0) {
+# more than one entry fit - how did that happen?
+	    $error='<font color="red">Error occured retrieving old values in '.
+	      'metadata table in LON-CAPA database: '.$#oldmeta.
+	      ' matches</font>';
+	    &Apache::lonnet::logthis($error);
+	    return ($error,undef);
+	}
+# store new data on top of it
+	foreach (keys %metadata) {
+	    $newmetadata{$_}=$metadata{$_};
+	}
+	$status = &Apache::lonmysql::store_row('metadata',\%newmetadata);
     }
-    # Store data in table.
-    $status = &Apache::lonmysql::store_row('metadata',\%metadata);
     if (! defined($status)) {
         $error='<font color="red">Error occured storing new values in '.
             'metadata table in LON-CAPA database</font>';
@@ -524,9 +836,50 @@ sub store_metadata {
     return (undef,$status);
 }
 
+
+# ============================================== Parse file itself for metadata
+#
+# parses a file with target meta, sets global %metadatafields %metadatakeys 
+
+sub parseformeta {
+    my ($source,$style)=@_;
+    my $allmeta='';
+    if (($style eq 'ssi') || ($style eq 'prv')) {
+	my $dir=$source;
+	$dir=~s-/[^/]*$--;
+	my $file=$source;
+	$file=(split('/',$file))[-1];
+        $source=&Apache::lonnet::hreflocation($dir,$file);
+	$allmeta=&Apache::lonnet::ssi_body($source,('grade_target' => 'meta'));
+        &metaeval($allmeta);
+    }
+    return $allmeta;
+}
+
+#########################################
+#########################################
+
+=pod
+
+=item B<publish>
+
+This is the workhorse function of this module.  This subroutine generates
+backup copies, performs any automatic processing (prior to publication,
+especially for rat and ssi files),
+
+Returns a 2 element array, the first is the string to be shown to the
+user, the second is an error code, either 1 (an error occured) or 0
+(no error occurred)
+
+I<Additional documentation needed.>
+
+=cut
+
+#########################################
+#########################################
 sub publish {
 
-    my ($source,$target,$style)=@_;
+    my ($source,$target,$style,$batch)=@_;
     my $logfile;
     my $scrout='';
     my $allmeta='';
@@ -534,13 +887,12 @@ sub publish {
     my %allow=();
 
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
-	return 
-         '<font color=red>No write permission to user directory, FAIL</font>';
+	return ('<font color="red">'.&mt('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')) {
+    if (($style eq 'ssi') || ($style eq 'rat') || ($style eq 'prv')) {
 # ------------------------------------------------------- This needs processing
 
 # ----------------------------------------------------------------- Backup Copy
@@ -549,15 +901,17 @@ sub publish {
 	    print $logfile "Copied original file to ".$copyfile."\n";
         } else {
 	    print $logfile "Unable to write backup ".$copyfile.':'.$!."\n";
-          return "<font color=red>Failed to write backup copy, $!,FAIL</font>";
+	    return ("<font color=\"red\">Failed to write backup copy, $!,FAIL</font>",1);
         }
 # ------------------------------------------------------------- IDs and indices
 	
-	my $outstring;
-	($outstring,%allow)=&fix_ids_and_indices($logfile,$source,$target);
+	my ($outstring,$error);
+	($outstring,$error,%allow)=&fix_ids_and_indices($logfile,$source,
+							$target);
+	if ($error) { return ($outstring,$error); }
 # ------------------------------------------------------------ Construct Allows
     
-	$scrout.='<h3>Dependencies</h3>';
+	$scrout.='<h3>'.&mt('Dependencies').'</h3>';
         my $allowstr='';
         foreach (sort(keys(%allow))) {
 	   my $thisdep=$_;
@@ -565,60 +919,62 @@ sub publish {
            unless ($style eq 'rat') { 
               $allowstr.="\n".'<allow src="'.$thisdep.'" />';
 	   }
-           $scrout.='<br>';
-           unless ($thisdep=~/\*/) {
+           $scrout.='<br />';
+           if ($thisdep!~/\*/ && $thisdep!~m|^/adm/|) {
 	       $scrout.='<a href="'.$thisdep.'">';
            }
            $scrout.='<tt>'.$thisdep.'</tt>';
-           unless ($thisdep=~/\*/) {
+           if ($thisdep!~/\*/ && $thisdep!~m|^/adm/|) {
 	       $scrout.='</a>';
                if (
        &Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'.
                                             $thisdep.'.meta') eq '-1') {
-		   $scrout.=
-                           ' - <font color=red>Currently not available</font>';
+		   $scrout.= ' - <font color="red">'.&mt('Currently not available').
+		       '</font>';
                } else {
                    my %temphash=(&Apache::lonnet::declutter($target).'___'.
                              &Apache::lonnet::declutter($thisdep).'___usage'
                                  => time);
                    $thisdep=~/^\/res\/(\w+)\/(\w+)\//;
                    if ((defined($1)) && (defined($2))) {
-                      &Apache::lonnet::put('resevaldata',\%temphash,$1,$2);
+                      &Apache::lonnet::put('nohist_resevaldata',\%temphash,
+					   $1,$2);
 		   }
 	       }
            }
         }
         $outstring=~s/\n*(\<\/[^\>]+\>)\s*$/$allowstr\n$1\n/s;
 
-	#Encode any High ASCII characters
-	$outstring=&HTML::Entities::encode($outstring,"\200-\377");
-# ------------------------------------------------------------- Write modified
+# ------------------------------------------------------------- Write modified.
 
         {
           my $org;
           unless ($org=Apache::File->new('>'.$source)) {
              print $logfile "No write permit to $source\n";
-             return 
-              "<font color=red>No write permission to $source, FAIL</font>";
+             return ('<font color="red">'.&mt('No write permission to').
+		     ' '.$source.
+		     ', '.&mt('FAIL').'</font>',1);
 	  }
-          print $org $outstring;
+          print($org $outstring);
         }
 	  $content=$outstring;
 
     }
-# --------------------------------------------- Initial step done, now metadata
-
-# ---------------------------------------- Storage for metadata keys and fields
+# -------------------------------------------- Initial step done, now metadata.
 
+# --------------------------------------- Storage for metadata keys and fields.
+# these are globals
+#
      %metadatafields=();
      %metadatakeys=();
      
      my %oldparmstores=();
      
-     
-     $scrout.='<h3>Metadata Information ' .
+    unless ($batch) {
+     $scrout.='<h3>'.&mt('Metadata Information').' ' .
        Apache::loncommon::help_open_topic("Metadata_Description")
        . '</h3>';
+    }
 
 # ------------------------------------------------ First, check out environment
      unless (-e $source.'.meta') {
@@ -633,17 +989,23 @@ sub publish {
 # ------------------------------------------------ Check out directory hierachy
 
         my $thisdisfn=$source;
-        $thisdisfn=~s/^\/home\/$cuname\///;
+        $thisdisfn=~s/^\/home\/\Q$cuname\E\///;
 
         my @urlparts=split(/\//,$thisdisfn);
         $#urlparts--;
 
         my $currentpath='/home/'.$cuname.'/';
 
+	my $prefix='../'x($#urlparts);
         foreach (@urlparts) {
 	    $currentpath.=$_.'/';
-            $scrout.=&metaread($logfile,$currentpath.'default.meta');
+            $scrout.=&metaread($logfile,$currentpath.'default.meta',$prefix);
+	    $prefix=~s|^\.\./||;
         }
+# ----------------------------------------------------------- Parse file itself
+# read %metadatafields from file itself
+ 
+	$allmeta=&parseformeta($source,$style);
 
 # ------------------- Clear out parameters and stores (there should not be any)
 
@@ -664,419 +1026,782 @@ sub publish {
 		delete $metadatafields{$_};
             }
         }
-        
-    }
+# ------------------------------------------ See if anything new in file itself
+ 
+	$allmeta=&parseformeta($source,$style);
 
-# -------------------------------------------------- Parse content for metadata
-    if ($style eq 'ssi') {
-        my $oldenv=$ENV{'request.uri'};
-
-        $ENV{'request.uri'}=$target;
-        $allmeta=Apache::lonxml::xmlparse(undef,'meta',$content);
-        $ENV{'request.uri'}=$oldenv;
+   }
 
-        &metaeval($allmeta);
-    }
+       
 # ---------------- Find and document discrepancies in the parameters and stores
 
-        my $chparms='';
-        foreach (sort keys %metadatafields) {
-	    if (($_=~/^parameter/) || ($_=~/^stores/)) {
-                unless ($_=~/\.\w+$/) { 
-                   unless ($oldparmstores{$_}) {
-		      print $logfile 'New: '.$_."\n";
-                      $chparms.=$_.' ';
-                   }
-	        }
-            }
-        }
-        if ($chparms) {
-	    $scrout.='<p><b>New parameters or stored values:</b> '.
-                     $chparms;
-        }
+    my $chparms='';
+    foreach (sort keys %metadatafields) {
+	if (($_=~/^parameter/) || ($_=~/^stores/)) {
+	    unless ($_=~/\.\w+$/) { 
+		unless ($oldparmstores{$_}) {
+		    print $logfile 'New: '.$_."\n";
+		    $chparms.=$_.' ';
+		}
+	    }
+	}
+    }
+    if ($chparms) {
+	$scrout.='<p><b>'.&mt('New parameters or stored values').
+	    ':</b> '.$chparms.'</p>';
+    }
 
-        $chparms='';
-        foreach (sort keys %oldparmstores) {
-	    if (($_=~/^parameter/) || ($_=~/^stores/)) {
-                unless (($metadatafields{$_.'.name'}) ||
-                        ($metadatafields{$_.'.package'}) || ($_=~/\.\w+$/)) {
-		    print $logfile 'Obsolete: '.$_."\n";
-                    $chparms.=$_.' ';
-                }
-            }
-        }
-        if ($chparms) {
-	    $scrout.='<p><b>Obsolete parameters or stored values:</b> '.
-                     $chparms;
-        }
+    $chparms='';
+    foreach (sort keys %oldparmstores) {
+	if (($_=~/^parameter/) || ($_=~/^stores/)) {
+	    unless (($metadatafields{$_.'.name'}) ||
+		    ($metadatafields{$_.'.package'}) || ($_=~/\.\w+$/)) {
+		print $logfile 'Obsolete: '.$_."\n";
+		$chparms.=$_.' ';
+	    }
+	}
+    }
+    if ($chparms) {
+	$scrout.='<p><b>'.&mt('Obsolete parameters or stored values').':</b> '.
+	    $chparms.'</p><h1><font color="red">'.&mt('Warning!').
+	    '</font></h1><p><font color="red" size="+1">'.
+	    &mt('If this resource is in active use, student performance data from the previous version may become inaccessible.').'</font></p><hr />';
+    }
 
 # ------------------------------------------------------- Now have all metadata
 
+    my %keywords=();
+        
+    if (length($content)<500000) {
+	my $textonly=$content;
+	$textonly=~s/\<script[^\<]+\<\/script\>//g;
+	$textonly=~s/\<m\>[^\<]+\<\/m\>//g;
+	$textonly=~s/\<[^\>]*\>//g;
+	$textonly=~tr/A-Z/a-z/;
+	$textonly=~s/[\$\&][a-z]\w*//g;
+	$textonly=~s/[^a-z\s]//g;
+	
+	foreach ($textonly=~m/(\w+)/g) {
+	    unless ($nokey{$_}) {
+		$keywords{$_}=1;
+	    } 
+	}
+    }
+
+            
+    foreach (split(/\W+/,$metadatafields{'keywords'})) {
+	$keywords{$_}=1;
+    }
+# --------------------------------------------------- Now we also have keywords
+# =============================================================================
+# INTERACTIVE MODE
+#
+    unless ($batch) {
         $scrout.=
-     '<form name="pubform" action="/adm/publish" method="post">'.
-       '<p><input type="submit" value="Finalize Publication" /></p>'.
-          &hiddenfield('phase','two').
-          &hiddenfield('filename',$ENV{'form.filename'}).
-	  &hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)).
-          &hiddenfield('dependencies',join(',',keys %allow)).
-          &textfield('Title','title',$metadatafields{'title'}).
-          &textfield('Author(s)','author',$metadatafields{'author'}).
-	  &textfield('Subject','subject',$metadatafields{'subject'});
+	    '<form name="pubform" action="/adm/publish" method="post">'.
+            '<p><input type="submit" value="'.&mt('Finalize Publication').'" /></p>'.
+            &hiddenfield('phase','two').
+            &hiddenfield('filename',$ENV{'form.filename'}).
+	    &hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)).
+            &hiddenfield('dependencies',join(',',keys %allow)).
+            &textfield('Title','title',$metadatafields{'title'}).
+            &textfield('Author(s)','author',$metadatafields{'author'}).
+	    &textfield('Subject','subject',$metadatafields{'subject'});
 
 # --------------------------------------------------- Scan content for keywords
 
         my $keywords_help = Apache::loncommon::help_open_topic("Publishing_Keywords");
+        my $KEYWORDS=&mt('Keywords');
+	my $CheckAll=&mt('check all');
+	my $UncheckAll=&mt('uncheck all');
 	my $keywordout=<<"END";
 <script>
-function checkAll(field)
-{
+function checkAll(field) {
     for (i = 0; i < field.length; i++)
         field[i].checked = true ;
 }
 
-function uncheckAll(field)
-{
+function uncheckAll(field) {
     for (i = 0; i < field.length; i++)
         field[i].checked = false ;
 }
 </script>
-<p><b>Keywords: $keywords_help</b> 
-<input type="button" value="check all" onclick="javascript:checkAll(document.pubform.keywords)"> 
-<input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.pubform.keywords)"> 
+<p><font color="#800000" face="helvetica"><b>$KEYWORDS:</b></font>
+ $keywords_help</b>
+<input type="button" value="$CheckAll" onclick="javascript:checkAll(document.pubform.keywords)" /> 
+<input type="button" value="$UncheckAll" onclick="javascript:uncheckAll(document.pubform.keywords)" /> 
+</p>
 <br />
 END
-        $keywordout.='<table border=2><tr>';
-        my $colcount=0;
-        my %keywords=();
-        
-	if (length($content)<500000) {
-	    my $textonly=$content;
-            $textonly=~s/\<script[^\<]+\<\/script\>//g;
-            $textonly=~s/\<m\>[^\<]+\<\/m\>//g;
-            $textonly=~s/\<[^\>]*\>//g;
-            $textonly=~tr/A-Z/a-z/;
-            $textonly=~s/[\$\&][a-z]\w*//g;
-            $textonly=~s/[^a-z\s]//g;
-
-            foreach ($textonly=~m/(\w+)/g) {
-		unless ($nokey{$_}) {
-                   $keywords{$_}=1;
-                } 
-            }
-        }
+	$keywordout.='<table border="2"><tr>';
+	my $colcount=0;
 
-            
-            foreach (split(/\W+/,$metadatafields{'keywords'})) {
-		$keywords{$_}=1;
-            }
+	foreach (sort keys %keywords) {
+	    $keywordout.='<td><input type="checkbox" name="keywords" value="'.$_.'"';
+	    if ($metadatafields{'keywords'}) {
+		if ($metadatafields{'keywords'}=~/\Q$_\E/) {
+		    $keywordout.=' checked="on"';
+		}
+	    } elsif (&Apache::loncommon::keyword($_)) {
+		$keywordout.=' checked="on"';
+	    }
+	    $keywordout.=' />'.$_.'</td>';
+	    if ($colcount>10) {
+		$keywordout.="</tr><tr>\n";
+		$colcount=0;
+	    }
+	    $colcount++;
+	}
 
-            foreach (sort keys %keywords) {
-                $keywordout.='<td><input type=checkbox name="keywords" value="'.$_.'"';
-                if ($metadatafields{'keywords'}) {
-                   if ($metadatafields{'keywords'}=~/$_/) { 
-                      $keywordout.=' checked'; 
-                   }
-	        } elsif (&Apache::loncommon::keyword($_)) {
-	            $keywordout.=' checked';
-                } 
-                $keywordout.='>'.$_.'</td>';
-                if ($colcount>10) {
-		    $keywordout.="</tr><tr>\n";
-                    $colcount=0;
-                }
-                $colcount++;
-            }
-        
 	$keywordout.='</tr></table>';
 
-        $scrout.=$keywordout;
+	$scrout.=$keywordout;
 
-        $scrout.=&textfield('Additional Keywords','addkey','');
+	$scrout.=&textfield('Additional Keywords','addkey','');
 
-        $scrout.=&textfield('Notes','notes',$metadatafields{'notes'});
+	$scrout.=&textfield('Notes','notes',$metadatafields{'notes'});
 
-        $scrout.=
-             '<p><b>Abstract:</b><br><textarea cols=80 rows=5 name=abstract>'.
-              $metadatafields{'abstract'}.'</textarea>';
+	$scrout.=
+	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>".&mt('Abstract').":".
+	    "</b></font></p><br />".
+	    '<textarea cols="80" rows="5" name="abstract">'.
+	    $metadatafields{'abstract'}.'</textarea></p>';
 
 	$source=~/\.(\w+)$/;
 
+
+	$scrout.=
+	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>".
+	    &mt('Lowest Grade Level').':'.
+           "</b></font></p><br />".
+	   &Apache::loncommon::select_level_form($metadatafields{'lowestgradelevel'},'lowestgradelevel').
+	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>".
+	    &mt('Highest Grade Level').':'.
+           "</b></font></p><br />".
+	   &Apache::loncommon::select_level_form($metadatafields{'highestgradelevel'},'highestgradelevel').
+           &textfield('Standards','standards',$metadatafields{'standards'});
+
+
+
+
 	$scrout.=&hiddenfield('mime',$1);
 
-        $scrout.=&selectbox('Language','language',
-                            $metadatafields{'language'},
+	my $defaultlanguage=$metadatafields{'language'};
+	$defaultlanguage =~ s/\s*notset\s*//g;
+	$defaultlanguage =~ s/^,\s*//g;
+	$defaultlanguage =~ s/,\s*$//g;
+
+	$scrout.=&selectbox('Language','language',
+			    $defaultlanguage,
 			    \&Apache::loncommon::languagedescription,
 			    (&Apache::loncommon::languageids),
-			     );
+			   );
 
-        unless ($metadatafields{'creationdate'}) {
+	unless ($metadatafields{'creationdate'}) {
 	    $metadatafields{'creationdate'}=time;
-        }
-        $scrout.=&hiddenfield('creationdate',$metadatafields{'creationdate'});
+	}
+	$scrout.=&hiddenfield('creationdate',
+			      &Apache::lonmysql::unsqltime($metadatafields{'creationdate'}));
+
+	$scrout.=&hiddenfield('lastrevisiondate',time);
 
-        $scrout.=&hiddenfield('lastrevisiondate',time);
 
-			   
 	$scrout.=&textfield('Publisher/Owner','owner',
-                            $metadatafields{'owner'});
-# --------------------------------------------------- Correct copyright for rat        
+			    $metadatafields{'owner'});
 
-    if ($style eq 'rat') {
-	if ($metadatafields{'copyright'} eq 'public') { 
-	    delete $metadatafields{'copyright'};
+# -------------------------------------------------- Correct copyright for rat.
+        my $defaultoption=$metadatafields{'copyright'};
+        unless ($defaultoption) { $defaultoption='default'; }
+	unless ($style eq 'prv') {
+	    if ($style eq 'rat') {
+		if ($metadatafields{'copyright'} eq 'public') { 
+		    delete $metadatafields{'copyright'};
+                    $defaultoption='default';
+		}
+		$scrout.=&selectbox('Copyright/Distribution','copyright',
+				    $defaultoption,
+				    \&Apache::loncommon::copyrightdescription,
+				    (grep !/^public$/,(&Apache::loncommon::copyrightids)));
+	    } else {
+		$scrout.=&selectbox('Copyright/Distribution','copyright',
+				    $defaultoption,
+				    \&Apache::loncommon::copyrightdescription,
+				    (&Apache::loncommon::copyrightids));
+	    }
+    
+	    my $copyright_help =
+		Apache::loncommon::help_open_topic('Publishing_Copyright');
+	    $scrout =~ s/DISTRIBUTION:/'DISTRIBUTION: ' . $copyright_help/ge;
+	    $scrout.=&textfield('Custom Distribution File','customdistributionfile',
+				$metadatafields{'customdistributionfile'}).
+				    $copyright_help;
+	    my $uctitle=&mt('Obsolete');
+            $scrout.=
+		"\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
+		'</b></font> <input type="checkbox" name="obsolete" ';
+	    if ($metadatafields{'obsolete'}) {
+		$scrout.=' checked="1" ';
+	    }
+	    $scrout.='/ ></p>'.
+		&textfield('Suggested Replacement for Obsolete File',
+				    'obsoletereplacement',
+				    $metadatafields{'obsoletereplacement'});
+	} else {
+	    $scrout.=&hiddenfield('copyright','private');
 	}
-        $scrout.=&selectbox('Copyright/Distribution','copyright',
-                            $metadatafields{'copyright'},
-			    \&Apache::loncommon::copyrightdescription,
-		     (grep !/^public$/,(&Apache::loncommon::copyrightids)));
-    }
-    else {
-        $scrout.=&selectbox('Copyright/Distribution','copyright',
-                            $metadatafields{'copyright'},
-			    \&Apache::loncommon::copyrightdescription,
-			     (&Apache::loncommon::copyrightids));
+	return ($scrout.'<p><input type="submit" value="'.
+		&mt('Finalize Publication').'" /></p></form>',0);
+# =============================================================================
+# BATCH MODE
+#
+    } else {
+# Transfer metadata directly to environment for stage 2
+	foreach (keys %metadatafields) {
+	    $ENV{'form.'.$_}=$metadatafields{$_};
+	}
+	$ENV{'form.addkey'}='';
+	$ENV{'form.keywords'}='';
+	foreach (keys %keywords) {
+	    if ($metadatafields{'keywords'}) {
+		if ($metadatafields{'keywords'}=~/\Q$_\E/) { 
+		    $ENV{'form.keywords'}.=$_.','; 
+		}
+	    } elsif (&Apache::loncommon::keyword($_)) {
+		$ENV{'form.keywords'}.=$_.',';
+	    }
+	}
+	$ENV{'form.keywords'}=~s/\,$//;
+	unless ($ENV{'form.creationdate'}) { $ENV{'form.creationdate'}=time; }
+	$ENV{'form.lastrevisiondate'}=time;
+	if ((($style eq 'rat') && ($ENV{'form.copyright'} eq 'public')) ||
+	    (!$ENV{'form.copyright'})) { 
+	    $ENV{'form.copyright'}='default';
+	}
+	$ENV{'form.allmeta'}=&Apache::lonnet::escape($allmeta);
+	return ($scrout,0);
     }
-
-    my $copyright_help = Apache::loncommon::help_open_topic("Publishing_Copyright");
-    $scrout =~ s/DISTRIBUTION:/'DISTRIBUTION: ' . $copyright_help/ge;
-    return $scrout.
-      '<p><input type="submit" value="Finalize Publication" /></p></form>';
 }
 
-# -------------------------------------------------------- Publication Step Two
+#########################################
+#########################################
+
+=pod 
+
+=item B<phasetwo>
+
+Render second interface showing status of publication steps.
+This is publication step two.
+
+Parameters:
+
+=over 4
+
+=item I<$source>
+
+=item I<$target>
+
+=item I<$style>
+
+=item I<$distarget>
+
+=back
+
+Returns:
+
+=over 4
+
+=item Scalar string
+
+String contains status (errors and warnings) and information associated with
+the server's attempts at publication.     
+
+=cut
 
+#'stupid emacs
+#########################################
+#########################################
 sub phasetwo {
 
-    my ($source,$target,$style,$distarget)=@_;
+    my ($r,$source,$target,$style,$distarget,$batch)=@_;
+    $source=~s/\/+/\//g;
+    $target=~s/\/+/\//g;
+
+    if ($target=~/\_\_\_/) {
+	$r->print(
+ '<font color="red">'.&mt('Unsupported character combination').
+		  ' "<tt>___</tt>" '.&mt('in filename, FAIL').'</font>');
+        return 0;
+    }
+    $distarget=~s/\/+/\//g;
     my $logfile;
-    my $scrout='';
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
-	return 
-         '<font color=red>No write permission to user directory, FAIL</font>';
+	$r->print(
+        '<font color="red">'.
+		&mt('No write permission to user directory, FAIL').'</font>');
+        return 0;
     }
     print $logfile 
-"\n================= Publish ".localtime()." Phase Two  ================\n";
-
-     %metadatafields=();
-     %metadatakeys=();
-
-     &metaeval(&Apache::lonnet::unescape($ENV{'form.allmeta'}));
-
-     $metadatafields{'title'}=$ENV{'form.title'};
-     $metadatafields{'author'}=$ENV{'form.author'};
-     $metadatafields{'subject'}=$ENV{'form.subject'};
-     $metadatafields{'notes'}=$ENV{'form.notes'};
-     $metadatafields{'abstract'}=$ENV{'form.abstract'};
-     $metadatafields{'mime'}=$ENV{'form.mime'};
-     $metadatafields{'language'}=$ENV{'form.language'};
-     $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'};
-
-     my $allkeywords=$ENV{'form.addkey'};
-     if (exists($ENV{'form.keywords'}) && (ref($ENV{'form.keywords'}))) {
-         my @Keywords = @{$ENV{'form.keywords'}};
-         foreach (@Keywords) {
-             $allkeywords.=','.$_;
-         }
-     }
-     $allkeywords=~s/\W+/\,/;
-     $allkeywords=~s/^\,//;
-     $metadatafields{'keywords'}=$allkeywords;
- 
-     {
-       print $logfile "\nWrite metadata file for ".$source;
-       my $mfh;
-       unless ($mfh=Apache::File->new('>'.$source.'.meta')) {
-	return 
-         '<font color=red>Could not write metadata, FAIL</font>';
-       }
-       foreach (sort keys %metadatafields) {
-	 unless ($_=~/\./) {
-           my $unikey=$_;
-           $unikey=~/^([A-Za-z]+)/;
-           my $tag=$1;
-           $tag=~tr/A-Z/a-z/;
-           print $mfh "\n\<$tag";
-           foreach (split(/\,/,$metadatakeys{$unikey})) {
-               my $value=$metadatafields{$unikey.'.'.$_};
-               $value=~s/\"/\'\'/g;
-               print $mfh ' '.$_.'="'.$value.'"';
-           }
-	   print $mfh '>'.
-	     &HTML::Entities::encode($metadatafields{$unikey})
-	       .'</'.$tag.'>';
-         }
-       }
-       $scrout.='<p>Wrote Metadata';
-       print $logfile "\nWrote metadata";
-     }
-
-# -------------------------------- Synchronize entry with SQL metadata database
-    my $warning;
-    $metadatafields{'url'} = $distarget;
-    $metadatafields{'version'} = 'current';
-    unless ($metadatafields{'copyright'} eq 'priv') {
-        my ($error,$success) = &store_metadata(\%metadatafields);
-        if (! $success) {
-            $scrout.='<p>Synchronized SQL metadata database';
-            print $logfile "\nSynchronized SQL metadata database";
+        "\n================= Publish ".localtime()." Phase Two  ================\n".$ENV{'user.name'}.'@'.$ENV{'user.domain'}."\n";
+    
+    %metadatafields=();
+    %metadatakeys=();
+    
+    &metaeval(&Apache::lonnet::unescape($ENV{'form.allmeta'}));
+    
+    $metadatafields{'title'}=$ENV{'form.title'};
+    $metadatafields{'author'}=$ENV{'form.author'};
+    $metadatafields{'subject'}=$ENV{'form.subject'};
+    $metadatafields{'notes'}=$ENV{'form.notes'};
+    $metadatafields{'abstract'}=$ENV{'form.abstract'};
+    $metadatafields{'mime'}=$ENV{'form.mime'};
+    $metadatafields{'language'}=$ENV{'form.language'};
+    $metadatafields{'creationdate'}=$ENV{'form.creationdate'};
+    $metadatafields{'lastrevisiondate'}=$ENV{'form.lastrevisiondate'};
+    $metadatafields{'owner'}=$ENV{'form.owner'};
+    $metadatafields{'copyright'}=$ENV{'form.copyright'};
+    $metadatafields{'standards'}=$ENV{'form.standards'};
+    $metadatafields{'lowestgradelevel'}=$ENV{'form.lowestgradelevel'};
+    $metadatafields{'highestgradelevel'}=$ENV{'form.highestgradelevel'};
+    $metadatafields{'customdistributionfile'}=
+                                 $ENV{'form.customdistributionfile'};
+    $metadatafields{'obsolete'}=$ENV{'form.obsolete'};
+    $metadatafields{'obsoletereplacement'}=
+	                        $ENV{'form.obsoletereplacement'};
+    $metadatafields{'dependencies'}=$ENV{'form.dependencies'};
+    $metadatafields{'modifyinguser'}=$ENV{'user.name'}.'@'.
+	                                 $ENV{'user.domain'};
+    $metadatafields{'authorspace'}=$cuname.'@'.$cudom;
+    
+    my $allkeywords=$ENV{'form.addkey'};
+    if (exists($ENV{'form.keywords'})) {
+        if (ref($ENV{'form.keywords'})) {
+            $allkeywords .= ','.join(',',@{$ENV{'form.keywords'}});
         } else {
-            $warning.=$error;
-            print $logfile "\n".$error;
+            $allkeywords .= ','.$ENV{'form.keywords'};
         }
-    } else {
-        $scrout.='<p>Private Publication - did not synchronize database';
-        print $logfile "\nPrivate: Did not synchronize data into ".
-            "SQL metadata database";
     }
-# ----------------------------------------------------------- Copy old versions
-   
-if (-e $target) {
-    my $filename;
-    my $maxversion=0;
-    $target=~/(.*)\/([^\/]+)\.(\w+)$/;
-    my $srcf=$2;
-    my $srct=$3;
-    my $srcd=$1;
-    unless ($srcd=~/^\/home\/httpd\/html\/res/) {
-	print $logfile "\nPANIC: Target dir is ".$srcd;
-        return "<font color=red>Invalid target directory, FAIL</font>";
+    $allkeywords=~s/\W+/\,/;
+    $allkeywords=~s/^\,//;
+    $metadatafields{'keywords'}=$allkeywords;
+    
+# check if custom distribution file is specified
+    if ($metadatafields{'copyright'} eq 'custom') {
+	my $file=$metadatafields{'customdistributionfile'};
+	unless ($file=~/\.rights$/) {
+            return 
+                '<font color="red">'.&mt('No valid custom distribution rights file specified, FAIL').
+		'</font>';
+        }
     }
-    opendir(DIR,$srcd);
-    while ($filename=readdir(DIR)) {
-       if ($filename=~/$srcf\.(\d+)\.$srct$/) {
-	   $maxversion=($1>$maxversion)?$1:$maxversion;
-       }
+    {
+        print $logfile "\nWrite metadata file for ".$source;
+        my $mfh;
+        unless ($mfh=Apache::File->new('>'.$source.'.meta')) {
+            return 
+                '<font color="red">'.&mt('Could not write metadata, FAIL').
+		'</font>';
+        }
+        foreach (sort keys %metadatafields) {
+            unless ($_=~/\./) {
+                my $unikey=$_;
+                $unikey=~/^([A-Za-z]+)/;
+                my $tag=$1;
+                $tag=~tr/A-Z/a-z/;
+                print $mfh "\n\<$tag";
+                foreach (split(/\,/,$metadatakeys{$unikey})) {
+                    my $value=$metadatafields{$unikey.'.'.$_};
+                    $value=~s/\"/\'\'/g;
+                    print $mfh ' '.$_.'="'.$value.'"';
+                }
+                print $mfh '>'.
+                    &HTML::Entities::encode($metadatafields{$unikey},'<>&"')
+                        .'</'.$tag.'>';
+            }
+        }
+        $r->print('<p>'.&mt('Wrote Metadata').'</p>');
+        print $logfile "\nWrote metadata";
     }
-    closedir(DIR);
-    $maxversion++;
-    $scrout.='<p>Creating old version '.$maxversion;
-    print $logfile "\nCreating old version ".$maxversion;
+    
+# -------------------------------- Synchronize entry with SQL metadata database
 
-    my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct;
+    $metadatafields{'url'} = $distarget;
+    $metadatafields{'version'} = 'current';
 
+    my ($error,$success) = &store_metadata(%metadatafields);
+    if ($success) {
+	$r->print('<p>'.&mt('Synchronized SQL metadata database').'</p>');
+	print $logfile "\nSynchronized SQL metadata database";
+    } else {
+	$r->print($error);
+	print $logfile "\n".$error;
+    }
+# --------------------------------------------- Delete author resource messages
+    my $delresult=&Apache::lonmsg::del_url_author_res_msg($target); 
+    $r->print('<p>'.&mt('Removing error messages:').' '.$delresult.'</p>');
+    print $logfile "\nRemoving error messages: $delresult";
+# ----------------------------------------------------------- Copy old versions
+   
+    if (-e $target) {
+        my $filename;
+        my $maxversion=0;
+        $target=~/(.*)\/([^\/]+)\.(\w+)$/;
+        my $srcf=$2;
+        my $srct=$3;
+        my $srcd=$1;
+        unless ($srcd=~/^\/home\/httpd\/html\/res/) {
+            print $logfile "\nPANIC: Target dir is ".$srcd;
+            return "<font color=\"red\">Invalid target directory, FAIL</font>";
+        }
+        opendir(DIR,$srcd);
+        while ($filename=readdir(DIR)) {
+            if (-l $srcd.'/'.$filename) {
+                unlink($srcd.'/'.$filename);
+                unlink($srcd.'/'.$filename.'.meta');
+            } else {
+                if ($filename=~/\Q$srcf\E\.(\d+)\.\Q$srct\E$/) {
+                    $maxversion=($1>$maxversion)?$1:$maxversion;
+                }
+            }
+        }
+        closedir(DIR);
+        $maxversion++;
+        $r->print('<p>Creating old version '.$maxversion.'</p>');
+        print $logfile "\nCreating old version ".$maxversion."\n";
+        
+        my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct;
+        
         if (copy($target,$copyfile)) {
 	    print $logfile "Copied old target to ".$copyfile."\n";
-            $scrout.='<p>Copied old target file';
+            $r->print('<p>'.&mt('Copied old target file').'</p>');
         } else {
 	    print $logfile "Unable to write ".$copyfile.':'.$!."\n";
-           return "<font color=red>Failed to copy old target, $!, FAIL</font>";
+            return "<font color=\"red\">".&mt('Failed to copy old target').
+		", $!, ".&mt('FAIL')."</font>";
         }
-
+        
 # --------------------------------------------------------------- Copy Metadata
 
 	$copyfile=$copyfile.'.meta';
-
+        
         if (copy($target.'.meta',$copyfile)) {
 	    print $logfile "Copied old target metadata to ".$copyfile."\n";
-            $scrout.='<p>Copied old metadata';
+            $r->print('<p>'.&mt('Copied old metadata').'</p>')
         } else {
 	    print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
             if (-e $target.'.meta') {
-               return 
-       "<font color=red>Failed to write old metadata copy, $!, FAIL</font>";
+                return 
+                    "<font color=\"red\">".
+&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</font>";
 	    }
         }
-
-
-} else {
-    $scrout.='<p>Initial version';
-    print $logfile "\nInitial version";
-}
+        
+        
+    } else {
+        $r->print('<p>'.&mt('Initial version').'</p>');
+        print $logfile "\nInitial version";
+    }
 
 # ---------------------------------------------------------------- Write Source
-	my $copyfile=$target;
-
-           my @parts=split(/\//,$copyfile);
-           my $path="/$parts[1]/$parts[2]/$parts[3]/$parts[4]";
-
-           my $count;
-           for ($count=5;$count<$#parts;$count++) {
-               $path.="/$parts[$count]";
-               if ((-e $path)!=1) {
-                   print $logfile "\nCreating directory ".$path;
-                   $scrout.='<p>Created directory '.$parts[$count];
-		   mkdir($path,0777);
-               }
-           }
-
-        if (copy($source,$copyfile)) {
-	    print $logfile "Copied original source to ".$copyfile."\n";
-            $scrout.='<p>Copied source file';
-        } else {
-	    print $logfile "Unable to write ".$copyfile.':'.$!."\n";
-            return "<font color=red>Failed to copy source, $!, FAIL</font>";
+    my $copyfile=$target;
+    
+    my @parts=split(/\//,$copyfile);
+    my $path="/$parts[1]/$parts[2]/$parts[3]/$parts[4]";
+    
+    my $count;
+    for ($count=5;$count<$#parts;$count++) {
+        $path.="/$parts[$count]";
+        if ((-e $path)!=1) {
+            print $logfile "\nCreating directory ".$path;
+            $r->print('<p>'.&mt('Created directory').' '.$parts[$count].'</p>');
+            mkdir($path,0777);
         }
-
+    }
+    
+    if (copy($source,$copyfile)) {
+        print $logfile "\nCopied original source to ".$copyfile."\n";
+        $r->print('<p>'.&mt('Copied source file').'</p>');
+    } else {
+        print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
+        return "<font color=\"red\">".
+	    &mt('Failed to copy source').", $!, ".&mt('FAIL')."</font>";
+    }
+    
 # --------------------------------------------------------------- Copy Metadata
 
-        $copyfile=$copyfile.'.meta';
-
-        if (copy($source.'.meta',$copyfile)) {
-	    print $logfile "Copied original metadata to ".$copyfile."\n";
-            $scrout.='<p>Copied metadata';
-        } else {
-	    print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
-            return 
-          "<font color=red>Failed to write metadata copy, $!, FAIL</font>";
-        }
-
+    $copyfile=$copyfile.'.meta';
+    
+    if (copy($source.'.meta',$copyfile)) {
+        print $logfile "\nCopied original metadata to ".$copyfile."\n";
+        $r->print('<p>'.&mt('Copied metadata').'</p>');
+    } else {
+        print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";
+        return 
+            "<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) {
-	$scrout.='<p>Notifying host '.$subhost.':';
+	$r->print('<p>'.&mt('Notifying host').' '.$subhost.':');$r->rflush;
 	print $logfile "\nNotifying host ".$subhost.':';
 	my $reply=&Apache::lonnet::critical('update:'.$target,$subhost);
-	$scrout.=$reply;
+	$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) {
-	$scrout.='<p>Notifying host for metadata only '.$subhost.':';
+	$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);
-	$scrout.=$reply;
+	$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;
     }
-
 # ------------------------------------------------ Provide link to new resource
+    unless ($batch) {
+        my $thisdistarget=$target;
+        $thisdistarget=~s/^\Q$docroot\E//;
+        
+        my $thissrc=$source;
+        $thissrc=~s/^\/home\/(\w+)\/public_html/\/priv\/$1/;
+        
+        my $thissrcdir=$thissrc;
+        $thissrcdir=~s/\/[^\/]+$/\//;
+        
+        
+        $r->print(
+           '<hr /><a href="'.$thisdistarget.'"><font size="+2">'.
+           &mt('View Published Version').'</font></a>'.
+           '<p><a href="'.$thissrc.'"><font size=+2>'.
+		  &mt('Back to Source').'</font></a></p>'.
+           '<p><a href="'.$thissrcdir.
+                   '"><font size="+2">'.
+		  &mt('Back to Source Directory').'</font></a></p>');
+    }
+    return '<p><font color="green">'.&mt('Done').'</font></p>';
+}
+
+#########################################
 
-    my $thisdistarget=$target;
-    $thisdistarget=~s/^$docroot//;
+sub batchpublish {
+    my ($r,$srcfile,$targetfile)=@_;
+    #publication pollutes %ENV with form.* values
+    my %oldENV=%ENV;
+    $srcfile=~s/\/+/\//g;
+    $targetfile=~s/\/+/\//g;
+    my $thisdisfn=$srcfile;
+    $thisdisfn=~s/\/home\/korte\/public_html\///;
+    $srcfile=~s/\/+/\//g;
+
+    my $docroot=$r->dir_config('lonDocRoot');
+    my $thisdistarget=$targetfile;
+    $thisdistarget=~s/^\Q$docroot\E//;
+
+
+    %metadatafields=();
+    %metadatakeys=();
+    $srcfile=~/\.(\w+)$/;
+    my $thistype=$1;
 
-    my $thissrc=$source;
-    $thissrc=~s/^\/home\/(\w+)\/public_html/\/priv\/$1/;
 
-    my $thissrcdir=$thissrc;
-    $thissrcdir=~s/\/[^\/]+$/\//;
+    my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
+     
+    $r->print('<h2>'.&mt('Publishing').' <tt>'.$thisdisfn.'</tt></h2>');
 
+# phase one takes
+#  my ($source,$target,$style,$batch)=@_;
+    my ($outstring,$error)=&publish($srcfile,$targetfile,$thisembstyle,1);
+    $r->print('<p>'.$outstring.'</p>');
+# phase two takes
+# my ($source,$target,$style,$distarget,batch)=@_;
+# $ENV{'form.allmeta'},$ENV{'form.title'},$ENV{'form.author'},...
+    if (!$error) {
+	$r->print('<p>');
+	&phasetwo($r,$srcfile,$targetfile,$thisembstyle,$thisdistarget,1);
+	$r->print('</p>');
+    }
+    %ENV=%oldENV;
+    return '';
+}
 
-    return $warning.$scrout.
-      '<hr><a href="'.$thisdistarget.'"><font size=+2>View Published Version</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>';
+#########################################
 
+sub publishdirectory {
+    my ($r,$fn,$thisdisfn)=@_;
+    $fn=~s/\/+/\//g;
+    $thisdisfn=~s/\/+/\//g;
+    my $resdir=
+	$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cudom.'/'.$cuname.'/'.
+	$thisdisfn;
+    $r->print('<h1>'.&mt('Directory').' <tt>'.$thisdisfn.'</tt></h1>'.
+	      &mt('Target').': <tt>'.$resdir.'</tt><br />');
+
+    my $dirptr=16384;		# Mask indicating a directory in stat.cmode.
+
+    opendir(DIR,$fn);
+    my @files=sort(readdir(DIR));
+    foreach my $filename (@files) {
+	my ($cdev,$cino,$cmode,$cnlink,
+            $cuid,$cgid,$crdev,$csize,
+            $catime,$cmtime,$cctime,
+            $cblksize,$cblocks)=stat($fn.'/'.$filename);
+
+	my $extension='';
+	if ($filename=~/\.(\w+)$/) { $extension=$1; }
+	if ($cmode&$dirptr) {
+	    if (($filename!~/^\./) && ($ENV{'form.pubrec'})) {
+		&publishdirectory($r,$fn.'/'.$filename,$thisdisfn.'/'.$filename);
+	    }
+	} elsif ((&Apache::loncommon::fileembstyle($extension) ne 'hdn') &&
+		 ($filename!~/^[\#\.]/) && ($filename!~/\~$/)) {
+# find out publication status and/or exiting metadata
+	    my $publishthis=0;
+	    if (-e $resdir.'/'.$filename) {
+	        my ($rdev,$rino,$rmode,$rnlink,
+		    $ruid,$rgid,$rrdev,$rsize,
+		    $ratime,$rmtime,$rctime,
+		    $rblksize,$rblocks)=stat($resdir.'/'.$filename);
+	        if (($rmtime<$cmtime) || ($ENV{'form.forcerepub'})) {
+# previously published, modified now
+		    $publishthis=1;
+                }
+	    } else {
+# never published
+		$publishthis=1;
+	    }
+	    if ($publishthis) {
+                &batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename);
+	    } else {
+		$r->print('<br />'.&mt('Skipping').' '.$filename.'<br />');
+	    }
+	    $r->rflush();
+	}
+    }
+    closedir(DIR);
 }
 
-# ================================================================ Main Handler
+#########################################
+# publish a default.meta file
+
+sub defaultmetapublish {
+    my ($r,$fn,$cuname,$cudom)=@_;
+    $fn=~s/^\/\~$cuname\//\/home\/$cuname\/public_html\//;
+    unless (-e $fn) {
+       return HTTP_NOT_FOUND;
+    }
+    my $target=$fn;
+    $target=~s/^\/home\/$cuname\/public_html\//$Apache::lonnet::perlvar{'lonDocRoot'}\/res\/$cudom\/$cuname\//;
 
+
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
+
+    $r->print('<html><head><title>LON-CAPA Publishing</title></head>');
+    $r->print(&Apache::loncommon::bodytag('Catalog Information Publication'));
+
+# ---------------------------------------------------------------- Write Source
+    my $copyfile=$target;
+    
+    my @parts=split(/\//,$copyfile);
+    my $path="/$parts[1]/$parts[2]/$parts[3]/$parts[4]";
+    
+    my $count;
+    for ($count=5;$count<$#parts;$count++) {
+        $path.="/$parts[$count]";
+        if ((-e $path)!=1) {
+            $r->print('<p>'.&mt('Created directory').' '.$parts[$count].'</p>');
+            mkdir($path,0777);
+        }
+    }
+    
+    if (copy($fn,$copyfile)) {
+        $r->print('<p>'.&mt('Copied source file').'</p>');
+    } else {
+        return "<font color=\"red\">".
+	    &mt('Failed to copy source').", $!, ".&mt('FAIL')."</font>";
+    }
+
+# --------------------------------------------------- Send update notifications
+
+    my @subscribed=&get_subscribed_hosts($target);
+    foreach my $subhost (@subscribed) {
+	$r->print('<p>'.&mt('Notifying host').' '.$subhost.':');$r->rflush;
+	my $reply=&Apache::lonnet::critical('update:'.$target,$subhost);
+	$r->print($reply.'</p><br />');$r->rflush;
+    }
+# ------------------------------------------------------------------- Link back
+    my $link=$fn;
+    $link=~s/^\/home\/$cuname\/public_html\//\/priv\/$cuname\//;
+    $r->print("<a href='$link'>".&mt('Back to Catalog Information').'</a>');
+    $r->print('</body></html>');
+    return OK;
+}
+#########################################
+
+=pod
+
+=item B<handler>
+
+A basic outline of the handler subroutine follows.
+
+=over 4
+
+=item *
+
+Get query string for limited number of parameters.
+
+=item *
+
+Check filename.
+
+=item *
+
+File is there and owned, init lookup tables.
+
+=item *
+
+Start page output.
+
+=item *
+
+Evaluate individual file, and then output information.
+
+=item *
+
+Publishing from $thisfn to $thistarget with $thisembstyle.
+
+=back
+
+=cut
+
+#########################################
+#########################################
 sub handler {
-  my $r=shift;
+    my $r=shift;
 
-  if ($r->header_only) {
-     $r->content_type('text/html');
-     $r->send_http_header;
-     return OK;
-  }
+    if ($r->header_only) {
+	&Apache::loncommon::content_type($r,'text/html');
+	$r->send_http_header;
+	return OK;
+    }
 
 # Get query string for limited number of parameters
 
@@ -1085,141 +1810,164 @@ sub handler {
 
 # -------------------------------------------------------------- Check filename
 
-  my $fn=$ENV{'form.filename'};
+    my $fn=&Apache::lonnet::unescape($ENV{'form.filename'});
+
+    ($cuname,$cudom)=
+	&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
 
+# special publication: default.meta file
+    if ($fn=~/\/default.meta$/) {
+	return &defaultmetapublish($r,$fn,$cuname,$cudom); 
+    }
+    $fn=~s/\.meta$//;
   
-  unless ($fn) { 
-     $r->log_reason($cuname.' at '.$cudom.
-         ' trying to publish empty filename', $r->filename); 
-     return HTTP_NOT_FOUND;
-  } 
-
-  ($cuname,$cudom)=
-    &Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
-  unless (($cuname) && ($cudom)) {
-     $r->log_reason($cuname.' at '.$cudom.
-         ' trying to publish file '.$ENV{'form.filename'}.
-         ' ('.$fn.') - not authorized', 
-         $r->filename); 
-     return HTTP_NOT_ACCEPTABLE;
-  }
-
-  unless (&Apache::lonnet::homeserver($cuname,$cudom) 
-          eq $r->dir_config('lonHostID')) {
-     $r->log_reason($cuname.' at '.$cudom.
-         ' trying to publish file '.$ENV{'form.filename'}.
-         ' ('.$fn.') - not homeserver ('.
-         &Apache::lonnet::homeserver($cuname,$cudom).')', 
-         $r->filename); 
-     return HTTP_NOT_ACCEPTABLE;
-  }
-
-  $fn=~s/^http\:\/\/[^\/]+//;
-  $fn=~s/^\/\~(\w+)/\/home\/$1\/public_html/;
-
-  my $targetdir='';
-  $docroot=$r->dir_config('lonDocRoot'); 
-  if ($1 ne $cuname) {
-     $r->log_reason($cuname.' at '.$cudom.
-         ' trying to publish unowned file '.$ENV{'form.filename'}.
-         ' ('.$fn.')', 
-         $r->filename); 
-     return HTTP_NOT_ACCEPTABLE;
-  } else {
-      $targetdir=$docroot.'/res/'.$cudom;
-  }
+    unless ($fn) { 
+	$r->log_reason($cuname.' at '.$cudom.
+		       ' trying to publish empty filename', $r->filename); 
+	return HTTP_NOT_FOUND;
+    } 
+
+    unless (($cuname) && ($cudom)) {
+	$r->log_reason($cuname.' at '.$cudom.
+		       ' trying to publish file '.$ENV{'form.filename'}.
+		       ' ('.$fn.') - not authorized', 
+		       $r->filename); 
+	return HTTP_NOT_ACCEPTABLE;
+    }
+
+    my $home=&Apache::lonnet::homeserver($cuname,$cudom);
+    my $allowed=0;
+    my @ids=&Apache::lonnet::current_machine_ids();
+    foreach my $id (@ids) { if ($id eq $home) { $allowed = 1; }  }
+    unless ($allowed) {
+	$r->log_reason($cuname.' at '.$cudom.
+		       ' trying to publish file '.$ENV{'form.filename'}.
+		       ' ('.$fn.') - not homeserver ('.$home.')', 
+		       $r->filename); 
+	return HTTP_NOT_ACCEPTABLE;
+    }
+
+    $fn=~s/^http\:\/\/[^\/]+//;
+    $fn=~s/^\/\~(\w+)/\/home\/$1\/public_html/;
+
+    my $targetdir='';
+    $docroot=$r->dir_config('lonDocRoot'); 
+    if ($1 ne $cuname) {
+	$r->log_reason($cuname.' at '.$cudom.
+		       ' trying to publish unowned file '.
+		       $ENV{'form.filename'}.' ('.$fn.')', 
+		       $r->filename); 
+	return HTTP_NOT_ACCEPTABLE;
+    } else {
+	$targetdir=$docroot.'/res/'.$cudom;
+    }
                                  
   
-  unless (-e $fn) { 
-     $r->log_reason($cuname.' at '.$cudom.
-         ' trying to publish non-existing file '.$ENV{'form.filename'}.
-         ' ('.$fn.')', 
-         $r->filename); 
-     return HTTP_NOT_FOUND;
-  } 
+    unless (-e $fn) { 
+	$r->log_reason($cuname.' at '.$cudom.
+		       ' trying to publish non-existing file '.
+		       $ENV{'form.filename'}.' ('.$fn.')', 
+		       $r->filename); 
+	return HTTP_NOT_FOUND;
+    } 
+
+    unless ($ENV{'form.phase'} eq 'two') {
+
+# -------------------------------- File is there and owned, init lookup tables.
+
+	%addid=();
+
+	{
+	    my $fh=Apache::File->new($r->dir_config('lonTabDir').'/addid.tab');
+	    while (<$fh>=~/(\w+)\s+(\w+)/) {
+		$addid{$1}=$2;
+	    }
+	}
 
-unless ($ENV{'form.phase'} eq 'two') {
+	%nokey=();
 
-# --------------------------------- File is there and owned, init lookup tables
+	{
+	    my $fh=Apache::File->new($r->dir_config('lonIncludes').'/un_keyword.tab');
+	    while (<$fh>) {
+		my $word=$_;
+		chomp($word);
+		$nokey{$word}=1;
+	    }
+	}
 
-  %addid=();
+    }
 
-  {
-      my $fh=Apache::File->new($r->dir_config('lonTabDir').'/addid.tab');
-      while (<$fh>=~/(\w+)\s+(\w+)/) {
-          $addid{$1}=$2;
-      }
-  }
+# ---------------------------------------------------------- Start page output.
 
-  %nokey=();
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
 
-  {
-     my $fh=Apache::File->new($r->dir_config('lonIncludes').'/un_keyword.tab');
-      while (<$fh>) {
-          my $word=$_;
-          chomp($word);
-          $nokey{$word}=1;
-      }
-  }
+    $r->print('<html><head><title>LON-CAPA Publishing</title></head>');
+    $r->print(&Apache::loncommon::bodytag('Resource Publication'));
 
-}
 
-# ----------------------------------------------------------- Start page output
+    my $thisfn=$fn;
 
-  $r->content_type('text/html');
-  $r->send_http_header;
+    my $thistarget=$thisfn;
+      
+    $thistarget=~s/^\/home/$targetdir/;
+    $thistarget=~s/\/public\_html//;
 
-  $r->print('<html><head><title>LON-CAPA Publishing</title></head>');
-  $r->print(
-   '<body bgcolor="#FFFFFF"><img align=right src=/adm/lonIcons/lonlogos.gif>');
-  my $thisfn=$fn;
-   
-# ------------------------------------------------------------- Individual file
-  {
-      $thisfn=~/\.(\w+)$/;
-      my $thistype=$1;
-      my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
+    my $thisdistarget=$thistarget;
+    $thisdistarget=~s/^\Q$docroot\E//;
 
-      my $thistarget=$thisfn;
-      
-      $thistarget=~s/^\/home/$targetdir/;
-      $thistarget=~s/\/public\_html//;
+    my $thisdisfn=$thisfn;
+    $thisdisfn=~s/^\/home\/\Q$cuname\E\/public_html\///;
 
-      my $thisdistarget=$thistarget;
-      $thisdistarget=~s/^$docroot//;
+    if ($fn=~/\/$/) {
+# -------------------------------------------------------- This is a directory
+	&publishdirectory($r,$fn,$thisdisfn);
+	$r->print('<hr><font size="+2">'.&mt('Done').'</font><br><a href="/priv/'
+		  .$cuname.'/'.$thisdisfn
+		  .'">'.&mt('Return to Directory').'</a>');
 
-      my $thisdisfn=$thisfn;
-      $thisdisfn=~s/^\/home\/$cuname\/public_html\///;
 
-      $r->print('<h2>Publishing '.
-        &Apache::loncommon::filedescription($thistype).' <tt>'.
-        $thisdisfn.'</tt></h2><b>Target:</b> <tt>'.$thisdistarget.'</tt><p>');
+    } else {
+# ---------------------- Evaluate individual file, and then output information.
+	$thisfn=~/\.(\w+)$/;
+	my $thistype=$1;
+	my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
+	$r->print('<h2>'.&mt('Publishing').' '.
+		  &Apache::loncommon::filedescription($thistype).' <tt>');
+
+	$r->print(<<ENDCAPTION);
+<a href='javascript:void(window.open("/~$cuname/$thisdisfn","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>
+$thisdisfn</a>
+ENDCAPTION
+        $r->print('</tt></h2><b>'.&mt('Target').':</b> <tt>'.
+		  $thisdistarget.'</tt><br />');
    
-       if (($cuname ne $ENV{'user.name'}) || ($cudom ne $ENV{'user.domain'})) {
-          $r->print('<h3><font color=red>Co-Author: '.$cuname.' at '.$cudom.
-               '</font></h3>');
-      }
-
-      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>');
-      }
-  
-# ------------ We are publishing from $thisfn to $thistarget with $thisembstyle
+	if (($cuname ne $ENV{'user.name'})||($cudom ne $ENV{'user.domain'})) {
+	    $r->print('<h3><font color="red">'.&mt('Co-Author').': '.
+		      $cuname.&mt(' at ').$cudom.'</font></h3>');
+	}
 
-       unless ($ENV{'form.phase'} eq 'two') {
-         $r->print(
-          '<hr>'.&publish($thisfn,$thistarget,$thisembstyle));
-       } else {
-         $r->print(
-          '<hr>'.&phasetwo($thisfn,$thistarget,$thisembstyle,$thisdistarget)); 
-       }  
+	if (&Apache::loncommon::fileembstyle($thistype) eq 'ssi') {
+	    $r->print(<<ENDDIFF);
+<br />
+<a href='javascript:void(window.open("/adm/diff?filename=/~$cuname/$thisdisfn&versiontwo=priv","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>
+ENDDIFF
+            $r->print(&mt('Diffs with Current Version').'</a><br />');
+	}
+  
+# ------------------ Publishing from $thisfn to $thistarget with $thisembstyle.
 
-  }
-  $r->print('</body></html>');
+	unless ($ENV{'form.phase'} eq 'two') {
+	    my ($outstring,$error)=&publish($thisfn,$thistarget,$thisembstyle);
+	    $r->print('<hr />'.$outstring);
+	} else {
+	    $r->print('<hr />'.
+	    &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget)); 
+	}
+    }
+    $r->print('</body></html>');
 
-  return OK;
+    return OK;
 }
 
 1;
@@ -1229,5 +1977,7 @@ __END__
 
 =back
 
+=back
+
 =cut