--- loncom/publisher/lonpublisher.pm	2001/03/29 21:45:06	1.21
+++ loncom/publisher/lonpublisher.pm	2001/05/03 11:18:28	1.26
@@ -7,7 +7,9 @@
 #
 # 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 Gerd Kortemeyer
 
 package Apache::lonpublisher;
 
@@ -18,6 +20,7 @@ use Apache::Constants qw(:common :http :
 use HTML::TokeParser;
 use Apache::lonxml;
 use Apache::lonhomework;
+use DBI;
 
 my %addid;
 my %nokey;
@@ -84,6 +87,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 +126,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 +151,7 @@ sub publish {
 
         my $maxindex=10;
         my $maxid=10;
-        my $content='';
+
         my $needsfixup=0;
 
         {
@@ -290,7 +303,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
@@ -324,7 +337,7 @@ sub publish {
 	    $scrout.='<p><b>Obsolete parameters or stored values:</b> '.
                      $chparms;
         }
-
+    }
 # ------------------------------------------------------- Now have all metadata
 
         $scrout.=
@@ -408,7 +421,6 @@ sub publish {
         $scrout.=&selectbox('Copyright/Distribution','copyright',
                             $metadatafields{'copyright'},%cprtag);
 
-    }
     return $scrout.
       '<p><input type="submit" value="Finalize Publication"></form>';
 }
@@ -417,7 +429,7 @@ sub publish {
 
 sub phasetwo {
 
-    my ($source,$target,$style)=@_;
+    my ($source,$target,$style,$distarget)=@_;
     my $logfile;
     my $scrout='';
 
@@ -481,6 +493,58 @@ 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 $dbh;
+    {
+	unless (
+		$dbh = DBI->connect("DBI:mysql:loncapa","www",$perlvar{'lonSqlAccess'},{ RaiseError =>0,PrintError=>0})
+		) { 
+	    return '<font color=red>Cannot connect to database!</font>';
+	}
+    }
+
+    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) {
@@ -631,8 +695,19 @@ if (-e $target) {
     my $thisdistarget=$target;
     $thisdistarget=~s/^$docroot//;
 
+    my $thissrc=$source;
+    $thissrc=~s/^\/home\/(\w+)\/public_html/\/priv\/$1/;
+
+    my $thissrcdir=$thissrc;
+    $thissrcdir=~s/\/[^\/]+$/\//;
+
+
     return $scrout.
-	'<p><a href="'.$thisdistarget.'"><font size=+2>View Target</font></a>';
+      '<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
@@ -763,13 +838,18 @@ unless ($ENV{'form.phase'} eq 'two') {
       $r->print('<h2>Publishing '.
         &Apache::lonnet::filedescription($thistype).' <tt>'.
         $thisdisfn.'</tt></h2><b>Target:</b> <tt>'.$thisdistarget.'</tt><p>');
+
+      if (&Apache::lonnet::fileembstyle($thistype) eq 'ssi') {
+          $r->print('<br><a href="/adm/diff?filename='.$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));
        } else {
-          $r->print('<hr>'.&phasetwo($thisfn,$thistarget,$thisembstyle));      
+          $r->print('<hr>'.&phasetwo($thisfn,$thistarget,$thisembstyle,$thisdistarget));      
        }  
 
   }