Diff for /loncom/publisher/lonpublisher.pm between versions 1.27 and 1.30

version 1.27, 2001/05/08 01:26:48 version 1.30, 2001/05/28 19:43:47
Line 10 Line 10
 # 03/24,03/29,04/03 Gerd Kortemeyer  # 03/24,03/29,04/03 Gerd Kortemeyer
 # 04/16/2001 Scott Harrison  # 04/16/2001 Scott Harrison
 # 05/03,05/05,05/07 Gerd Kortemeyer  # 05/03,05/05,05/07 Gerd Kortemeyer
   # 05/28/2001 Scott Harrison
   
 package Apache::lonpublisher;  package Apache::lonpublisher;
   
Line 510  sub phasetwo { Line 511  sub phasetwo {
     }      }
     close(CONFIG);      close(CONFIG);
   
       my $warning;
     my $dbh;      my $dbh;
     {      {
  unless (   unless (
  $dbh = DBI->connect("DBI:mysql:loncapa","www",$perlvar{'lonSqlAccess'},{ RaiseError =>0,PrintError=>0})   $dbh = DBI->connect("DBI:mysql:loncapa","www",$perlvar{'lonSqlAccess'},{ RaiseError =>0,PrintError=>0})
  ) {    ) { 
     return '<font color=red>Cannot connect to database!</font>';      $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";
  }   }
     }      }
   
     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  # ----------------------------------------------------------- Copy old versions
         
Line 706  if (-e $target) { Line 718  if (-e $target) {
     $thissrcdir=~s/\/[^\/]+$/\//;      $thissrcdir=~s/\/[^\/]+$/\//;
   
   
     return $scrout.      return $warning.$scrout.
       '<hr><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="'.$thissrc.'"><font size=+2>Back to Source</font></a>'.
       '<p><a href="'.$thissrcdir.        '<p><a href="'.$thissrcdir.
Line 861  unless ($ENV{'form.phase'} eq 'two') { Line 873  unless ($ENV{'form.phase'} eq 'two') {
       }        }
   
       if (&Apache::lonnet::fileembstyle($thistype) eq 'ssi') {        if (&Apache::lonnet::fileembstyle($thistype) eq 'ssi') {
           $r->print('<br><a href="/adm/diff?filename='.$thisdisfn.            $r->print('<br><a href="/adm/diff?filename=/~'.$cuname.'/'.
                       $thisdisfn.
    '&versionone=priv" target=cat>Diffs with Current Version</a><p>');     '&versionone=priv" target=cat>Diffs with Current Version</a><p>');
       }        }
       

Removed from v.1.27  
changed lines
  Added in v.1.30


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