--- loncom/publisher/lonpublisher.pm	2001/04/03 11:07:36	1.22
+++ loncom/publisher/lonpublisher.pm	2001/08/07 21:27:06	1.33
@@ -7,7 +7,11 @@
 #
 # 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer
 # 03/23 Guy Albertelli
-# 03/24,03/29 Gerd Kortemeyer
+# 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 Gerd Kortemeyer
 
 package Apache::lonpublisher;
 
@@ -18,6 +22,8 @@ use Apache::Constants qw(:common :http :
 use HTML::TokeParser;
 use Apache::lonxml;
 use Apache::lonhomework;
+use Apache::loncacc;
+use DBI;
 
 my %addid;
 my %nokey;
@@ -29,6 +35,9 @@ my %metadatakeys;
 
 my $docroot;
 
+my $cuname;
+my $cudom;
+
 # ----------------------------------------------- Evaluate string with metadata
 
 sub metaeval {
@@ -40,9 +49,15 @@ sub metaeval {
            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'}; 
 	      }
@@ -84,6 +99,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 {
@@ -115,6 +138,8 @@ sub publish {
     my ($source,$target,$style)=@_;
     my $logfile;
     my $scrout='';
+    my $allmeta='';
+    my $content='';
 
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
 	return 
@@ -138,7 +163,7 @@ sub publish {
 
         my $maxindex=10;
         my $maxid=10;
-        my $content='';
+
         my $needsfixup=0;
 
         {
@@ -249,17 +274,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.=$_.'/';
@@ -290,7 +315,8 @@ 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
@@ -314,7 +340,8 @@ sub publish {
         my $chparms='';
         map {
 	    if (($_=~/^parameter/) || ($_=~/^stores/)) {
-                unless (($metadatafields{$_.'.name'}) || ($_=~/\.\w+$/)) {
+                unless (($metadatafields{$_.'.name'}) ||
+                        ($metadatafields{$_.'.package'}) || ($_=~/\.\w+$/)) {
 		    print $logfile 'Obsolete: '.$_."\n";
                     $chparms.=$_.' ';
                 }
@@ -324,7 +351,7 @@ sub publish {
 	    $scrout.='<p><b>Obsolete parameters or stored values:</b> '.
                      $chparms;
         }
-
+    }
 # ------------------------------------------------------- Now have all metadata
 
         $scrout.=
@@ -408,7 +435,6 @@ sub publish {
         $scrout.=&selectbox('Copyright/Distribution','copyright',
                             $metadatafields{'copyright'},%cprtag);
 
-    }
     return $scrout.
       '<p><input type="submit" value="Finalize Publication"></form>';
 }
@@ -417,7 +443,7 @@ sub publish {
 
 sub phasetwo {
 
-    my ($source,$target,$style)=@_;
+    my ($source,$target,$style,$distarget)=@_;
     my $logfile;
     my $scrout='';
 
@@ -481,6 +507,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) {
@@ -638,7 +727,7 @@ if (-e $target) {
     $thissrcdir=~s/\/[^\/]+$/\//;
 
 
-    return $scrout.
+    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.
@@ -661,16 +750,29 @@ 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'}.
+  ($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 homeserver ('.$ENV{'user.home'}.')', 
+         ' ('.$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;
   }
@@ -679,19 +781,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); 
@@ -769,18 +871,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)); 
        }  
 
   }