Diff for /loncom/publisher/lonpublisher.pm between versions 1.23 and 1.24

version 1.23, 2001/04/03 11:26:02 version 1.24, 2001/04/16 20:02:50
Line 8 Line 8
 # 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer  # 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer
 # 03/23 Guy Albertelli  # 03/23 Guy Albertelli
 # 03/24,03/29,04/03 Gerd Kortemeyer  # 03/24,03/29,04/03 Gerd Kortemeyer
   # 04/16/2001 Scott Harrison
   
 package Apache::lonpublisher;  package Apache::lonpublisher;
   
Line 18  use Apache::Constants qw(:common :http : Line 19  use Apache::Constants qw(:common :http :
 use HTML::TokeParser;  use HTML::TokeParser;
 use Apache::lonxml;  use Apache::lonxml;
 use Apache::lonhomework;  use Apache::lonhomework;
   use DBI;
   
 my %addid;  my %addid;
 my %nokey;  my %nokey;
Line 418  sub publish { Line 420  sub publish {
   
 sub phasetwo {  sub phasetwo {
   
     my ($source,$target,$style)=@_;      my ($source,$target,$style,$distarget)=@_;
     my $logfile;      my $logfile;
     my $scrout='';      my $scrout='';
   
Line 482  sub phasetwo { Line 484  sub phasetwo {
        print $logfile "\nWrote metadata";         print $logfile "\nWrote metadata";
      }       }
   
   # -------------------------------- Synchronize entry with SQL metadata database
       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;
       $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'}).'"'.','.
     '"'.delete($sqldatafields{'creationdate'}).'"'.','.
     '"'.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  # ----------------------------------------------------------- Copy old versions
         
 if (-e $target) {  if (-e $target) {
Line 781  unless ($ENV{'form.phase'} eq 'two') { Line 823  unless ($ENV{'form.phase'} eq 'two') {
        unless ($ENV{'form.phase'} eq 'two') {         unless ($ENV{'form.phase'} eq 'two') {
           $r->print('<hr>'.&publish($thisfn,$thistarget,$thisembstyle));            $r->print('<hr>'.&publish($thisfn,$thistarget,$thisembstyle));
        } else {         } else {
           $r->print('<hr>'.&phasetwo($thisfn,$thistarget,$thisembstyle));                  $r->print('<hr>'.&phasetwo($thisfn,$thistarget,$thisembstyle,$thisdistarget));      
        }           }  
   
   }    }

Removed from v.1.23  
changed lines
  Added in v.1.24


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>