--- loncom/publisher/lonpublisher.pm	2001/12/05 21:17:56	1.60
+++ loncom/publisher/lonpublisher.pm	2001/12/07 22:37:56	1.64
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.60 2001/12/05 21:17:56 www Exp $
+# $Id: lonpublisher.pm,v 1.64 2001/12/07 22:37:56 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,6 +39,8 @@
 # 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
 
 package Apache::lonpublisher;
 
@@ -349,12 +351,14 @@ sub publish {
               }
           }
 # ------------------------------------------------------------ Construct Allows
-     unless ($style eq 'rat') {
+    
 	$scrout.='<h3>Dependencies</h3>';
-	my $allowstr="\n";
+        my $allowstr='';
         map {
 	   my $thisdep=$_;
-           $allowstr.='<allow src="'.$thisdep.'" />'."\n";
+           unless ($style eq 'rat') { 
+              $allowstr.="\n".'<allow src="'.$thisdep.'" />';
+	   }
            $scrout.='<br>';
            unless ($thisdep=~/\*/) {
 	       $scrout.='<a href="'.$thisdep.'">';
@@ -379,7 +383,7 @@ sub publish {
            }
         } keys %allow;
         $outstring=~s/(\<\/[^\>]+\>\s*)$/$allowstr$1/s;
-    }
+
 # ------------------------------------------------------------- Write modified
 
         {
@@ -506,6 +510,7 @@ sub publish {
 
         $scrout.=
      '<form 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)).
@@ -597,7 +602,7 @@ sub publish {
                             $metadatafields{'copyright'},%cprtag);
 
     return $scrout.
-      '<p><input type="submit" value="Finalize Publication"></form>';
+      '<p><input type="submit" value="Finalize Publication" /></p></form>';
 }
 
 # -------------------------------------------------------- Publication Step Two
@@ -670,23 +675,15 @@ sub phasetwo {
      }
 
 # -------------------------------- Synchronize entry with SQL metadata database
-    my %perlvar;
-    open (CONFIG,"/etc/httpd/conf/access.conf") || die "Can't read access.conf";
-    my $configline;
-    while ($configline=<CONFIG>) {
-	if ($configline =~ /PerlSetVar/) {
-	    my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
-	    chomp($varvalue);
-	    $perlvar{$varname}=$varvalue;
-	}
-    }
-    close(CONFIG);
+  my $warning;
+
+  unless ($metadatafields{'copyright'} eq 'priv') {
 
-    my $warning;
     my $dbh;
     {
 	unless (
-		$dbh = DBI->connect("DBI:mysql:loncapa","www",$perlvar{'lonSqlAccess'},{ RaiseError =>0,PrintError=>0})
+		$dbh = DBI->connect("DBI:mysql:loncapa","www",
+    $Apache::lonnet::perlvar{'lonSqlAccess'},{ RaiseError =>0,PrintError=>0})
 		) { 
 	    $warning='<font color=red>WARNING: Cannot connect to '.
 		'database!</font>';
@@ -731,7 +728,10 @@ sub phasetwo {
 	}
     }
 
-
+} else {
+    $scrout.='<p>Private Publication - did not synchronize database';
+    print $logfile "\nPrivate: Did not ynchronized SQL metadata database";
+}
 # ----------------------------------------------------------- Copy old versions
    
 if (-e $target) {