--- loncom/publisher/lonpublisher.pm	2000/12/04 12:27:58	1.12
+++ loncom/publisher/lonpublisher.pm	2001/05/28 19:43:47	1.30
@@ -5,18 +5,24 @@
 #
 # 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
+# 04/16/2001 Scott Harrison
+# 05/03,05/05,05/07 Gerd Kortemeyer
+# 05/28/2001 Scott Harrison
 
 package Apache::lonpublisher;
 
 use strict;
 use Apache::File;
+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;
+use Apache::loncacc;
+use DBI;
 
 my %addid;
 my %nokey;
@@ -28,6 +34,9 @@ my %metadatakeys;
 
 my $docroot;
 
+my $cuname;
+my $cudom;
+
 # ----------------------------------------------- Evaluate string with metadata
 
 sub metaeval {
@@ -83,6 +92,14 @@ sub metaread {
     return '<br><b>Processed file:</b> <tt>'.$fn.'</tt>';
 }
 
+# ---------------------------- convert 'time' format into a datetime sql format
+sub sqltime {
+    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
+	localtime(@_[0]);
+    $mon++; $year+=1900;
+    return "$year-$mon-$mday $hour:$min:$sec";
+}
+
 # --------------------------------------------------------- Various form fields
 
 sub textfield {
@@ -114,6 +131,8 @@ sub publish {
     my ($source,$target,$style)=@_;
     my $logfile;
     my $scrout='';
+    my $allmeta='';
+    my $content='';
 
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
 	return 
@@ -127,22 +146,17 @@ sub publish {
 
 # ----------------------------------------------------------------- Backup Copy
 	my $copyfile=$source.'.save';
-        {
-	    my $org=Apache::File->new($source);
-            my $cop=Apache::File->new('>'.$copyfile);
-            while (my $line=<$org>) { print $cop $line; }
-        }
-        if (-e $copyfile) {
+        if (copy($source,$copyfile)) {
 	    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>";
+	    print $logfile "Unable to write backup ".$copyfile.':'.$!."\n";
+          return "<font color=red>Failed to write backup copy, $!,FAIL</font>";
         }
 # ------------------------------------------------------------- IDs and indices
 
         my $maxindex=10;
         my $maxid=10;
-        my $content='';
+
         my $needsfixup=0;
 
         {
@@ -253,17 +267,17 @@ sub publish {
 		                  $ENV{'environment.generation'};
         $metadatafields{'author'}=~s/\s+/ /g;
         $metadatafields{'author'}=~s/\s+$//;
-        $metadatafields{'owner'}=$ENV{'user.name'}.'@'.$ENV{'user.domain'};
+        $metadatafields{'owner'}=$cuname.'@'.$cudom;
 
 # ------------------------------------------------ Check out directory hierachy
 
         my $thisdisfn=$source;
-        $thisdisfn=~s/^\/home\/$ENV{'user.name'}\///;
+        $thisdisfn=~s/^\/home\/$cuname\///;
 
         my @urlparts=split(/\//,$thisdisfn);
         $#urlparts--;
 
-        my $currentpath='/home/'.$ENV{'user.name'}.'/';
+        my $currentpath='/home/'.$cuname.'/';
 
         map {
 	    $currentpath.=$_.'/';
@@ -294,7 +308,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
@@ -328,7 +342,7 @@ sub publish {
 	    $scrout.='<p><b>Obsolete parameters or stored values:</b> '.
                      $chparms;
         }
-
+    }
 # ------------------------------------------------------- Now have all metadata
 
         $scrout.=
@@ -412,7 +426,6 @@ sub publish {
         $scrout.=&selectbox('Copyright/Distribution','copyright',
                             $metadatafields{'copyright'},%cprtag);
 
-    }
     return $scrout.
       '<p><input type="submit" value="Finalize Publication"></form>';
 }
@@ -421,7 +434,7 @@ sub publish {
 
 sub phasetwo {
 
-    my ($source,$target,$style)=@_;
+    my ($source,$target,$style,$distarget)=@_;
     my $logfile;
     my $scrout='';
 
@@ -485,6 +498,69 @@ sub phasetwo {
        print $logfile "\nWrote metadata";
      }
 
+# -------------------------------- 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;
+    my $dbh;
+    {
+	unless (
+		$dbh = DBI->connect("DBI:mysql:loncapa","www",$perlvar{'lonSqlAccess'},{ RaiseError =>0,PrintError=>0})
+		) { 
+	    $warning='<font color=red>WARNING: Cannot connect to '.
+		'database!</font>';
+	}
+	else {
+	    my %sqldatafields;
+	    $sqldatafields{'url'}=$distarget;
+	    my $sth=$dbh->prepare(
+				  'delete from metadata where url like binary'.
+				  '"'.$sqldatafields{'url'}.'"');
+	    $sth->execute();
+	    map {my $field=$metadatafields{$_}; $field=~s/\"/\'\'/g; 
+		 $sqldatafields{$_}=$field;}
+	    ('title','author','subject','keywords','notes','abstract',
+	     'mime','language','creationdate','lastrevisiondate','owner',
+	     'copyright');
+	    
+	    $sth=$dbh->prepare('insert into metadata values ('.
+			       '"'.delete($sqldatafields{'title'}).'"'.','.
+			       '"'.delete($sqldatafields{'author'}).'"'.','.
+			       '"'.delete($sqldatafields{'subject'}).'"'.','.
+			       '"'.delete($sqldatafields{'url'}).'"'.','.
+			       '"'.delete($sqldatafields{'keywords'}).'"'.','.
+			       '"'.'current'.'"'.','.
+			       '"'.delete($sqldatafields{'notes'}).'"'.','.
+			       '"'.delete($sqldatafields{'abstract'}).'"'.','.
+			       '"'.delete($sqldatafields{'mime'}).'"'.','.
+			       '"'.delete($sqldatafields{'language'}).'"'.','.
+			       '"'.
+			       sqltime(delete($sqldatafields{'creationdate'}))
+			       .'"'.','.
+			       '"'.
+			       sqltime(delete(
+			       $sqldatafields{'lastrevisiondate'})).'"'.','.
+			       '"'.delete($sqldatafields{'owner'}).'"'.','.
+			       '"'.delete(
+			       $sqldatafields{'copyright'}).'"'.')');
+	    $sth->execute();
+	    $dbh->disconnect;
+	    $scrout.='<p>Synchronized SQL metadata database';
+	    print $logfile "\nSynchronized SQL metadata database";
+	}
+    }
+
+
 # ----------------------------------------------------------- Copy old versions
    
 if (-e $target) {
@@ -511,39 +587,27 @@ if (-e $target) {
 
     my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct;
 
-        {
-	    my $org=Apache::File->new($target);
-            my $cop;
-            unless ($cop=Apache::File->new('>'.$copyfile)) {
-                print $logfile "Unable to open for write ".$copyfile."\n";
-                return "<font color=red>Failed to open '.$copyfile.
-                       ', FAIL</font>";
-            }
-            while (my $line=<$org>) { print $cop $line; }
-        }
-        if (-e $copyfile) {
+        if (copy($target,$copyfile)) {
 	    print $logfile "Copied old target to ".$copyfile."\n";
             $scrout.='<p>Copied old target file';
         } else {
-	    print $logfile "Unable to write ".$copyfile."\n";
-            return "<font color=red>Failed to copy old target, FAIL</font>";
+	    print $logfile "Unable to write ".$copyfile.':'.$!."\n";
+           return "<font color=red>Failed to copy old target, $!, FAIL</font>";
         }
 
 # --------------------------------------------------------------- Copy Metadata
 
 	$copyfile=$copyfile.'.meta';
-        {
-	    my $org=Apache::File->new($target.'.meta');
-            my $cop=Apache::File->new('>'.$copyfile);
-            while (my $line=<$org>) { print $cop $line; }
-        }
-        if (-e $copyfile) {
-	    print $logfile "Copied old target  metadata to ".$copyfile."\n";
+
+        if (copy($target.'.meta',$copyfile)) {
+	    print $logfile "Copied old target metadata to ".$copyfile."\n";
             $scrout.='<p>Copied old metadata';
         } else {
-	    print $logfile "Unable to write metadata ".$copyfile."\n";
-            return 
-              "<font color=red>Failed to write old metadata copy, FAIL</font>";
+	    print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
+            if (-e $target.'.meta') {
+               return 
+       "<font color=red>Failed to write old metadata copy, $!, FAIL</font>";
+	    }
         }
 
 
@@ -568,39 +632,25 @@ if (-e $target) {
                }
            }
 
-        {
-	    my $org=Apache::File->new($source);
-            my $cop;
-            unless ($cop=Apache::File->new('>'.$copyfile)) {
-                print $logfile "Unable to open for write ".$copyfile."\n";
-                return "<font color=red>Failed to open '.$copyfile.
-                       ', FAIL</font>";
-            }
-            while (my $line=<$org>) { print $cop $line; }
-        }
-        if (-e $copyfile) {
+        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>";
+	    print $logfile "Unable to write ".$copyfile.':'.$!."\n";
+            return "<font color=red>Failed to copy source, $!, FAIL</font>";
         }
 
 # --------------------------------------------------------------- Copy Metadata
 
-	my $copyfile=$target.'.meta';
-        {
-	    my $org=Apache::File->new($source.'.meta');
-            my $cop=Apache::File->new('>'.$copyfile);
-            while (my $line=<$org>) { print $cop $line; }
-        }
-        if (-e $copyfile) {
+        $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";
+	    print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
             return 
-                 "<font color=red>Failed to write metadata copy, FAIL</font>";
+          "<font color=red>Failed to write metadata copy, $!, FAIL</font>";
         }
 
 # --------------------------------------------------- Send update notifications
@@ -628,13 +678,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//;
 
-    return $scrout.
-	'<p><a href="'.$thisdistarget.'"><font size=+2>View Target</font></a>';
+    my $thissrc=$source;
+    $thissrc=~s/^\/home\/(\w+)\/public_html/\/priv\/$1/;
+
+    my $thissrcdir=$thissrc;
+    $thissrcdir=~s/\/[^\/]+$/\//;
+
+
+    return $warning.$scrout.
+      '<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
@@ -652,16 +741,28 @@ sub handler {
 
   my $fn=$ENV{'form.filename'};
 
+  
   unless ($fn) { 
-     $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
+     $r->log_reason($cuname.' at '.$cudom.
          ' trying to publish empty filename', $r->filename); 
      return HTTP_NOT_FOUND;
   } 
 
-  unless ($ENV{'user.home'} eq $r->dir_config('lonHostID')) {
-     $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
+  unless (($cuname,$cudom)=
+    &Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'))) {
+     $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 ('.$ENV{'user.home'}.')', 
+         ' ('.$fn.') - not homeserver ('.
+         &Apache::lonnet::homeserver($cuname,$cudom).')', 
          $r->filename); 
      return HTTP_NOT_ACCEPTABLE;
   }
@@ -670,19 +771,19 @@ sub handler {
 
   my $targetdir='';
   $docroot=$r->dir_config('lonDocRoot'); 
-  if ($1 ne $ENV{'user.name'}) {
-     $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
+  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/'.$ENV{'user.domain'};
+      $targetdir=$docroot.'/res/'.$cudom;
   }
                                  
   
   unless (-e $fn) { 
-     $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
+     $r->log_reason($cuname.' at '.$cudom.
          ' trying to publish non-existing file '.$ENV{'form.filename'}.
          ' ('.$fn.')', 
          $r->filename); 
@@ -741,7 +842,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
@@ -759,18 +861,31 @@ unless ($ENV{'form.phase'} eq 'two') {
       $thisdistarget=~s/^$docroot//;
 
       my $thisdisfn=$thisfn;
-      $thisdisfn=~s/^\/home\/$ENV{'user.name'}\/public_html\///;
+      $thisdisfn=~s/^\/home\/$cuname\/public_html\///;
 
       $r->print('<h2>Publishing '.
         &Apache::lonnet::filedescription($thistype).' <tt>'.
         $thisdisfn.'</tt></h2><b>Target:</b> <tt>'.$thisdistarget.'</tt><p>');
+   
+       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::lonnet::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
 
        unless ($ENV{'form.phase'} eq 'two') {
-          $r->print('<hr>'.&publish($thisfn,$thistarget,$thisembstyle));
+         $r->print(
+          '<hr>'.&publish($thisfn,$thistarget,$thisembstyle));
        } else {
-          $r->print('<hr>'.&phasetwo($thisfn,$thistarget,$thisembstyle));      
+         $r->print(
+          '<hr>'.&phasetwo($thisfn,$thistarget,$thisembstyle,$thisdistarget)); 
        }  
 
   }