Diff for /loncom/publisher/lonpublisher.pm between versions 1.155 and 1.156

version 1.155, 2003/12/27 16:58:36 version 1.156, 2003/12/28 20:12:59
Line 126  use Apache::loncommon(); Line 126  use Apache::loncommon();
 use Apache::lonmysql;  use Apache::lonmysql;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::loncfile;  use Apache::loncfile;
   use Apache::lonmeta;
 use vars qw(%metadatafields %metadatakeys);  use vars qw(%metadatafields %metadatakeys);
   
 my %addid;  my %addid;
Line 799  sub store_metadata { Line 800  sub store_metadata {
  $metadata{'sequsage'}=$metadata{'usage'};   $metadata{'sequsage'}=$metadata{'usage'};
  $metadata{'sequsage_list'}=$metadata{'usage_list'};   $metadata{'sequsage_list'}=$metadata{'usage_list'};
  my %newmetadata=();   my %newmetadata=();
 # retrieve current database column names  
  my @columns=&Apache::lonmysql::col_order('metadata');  
 # see if we have old entries  # see if we have old entries
  my @oldmeta=&Apache::lonmysql::get_rows('metadata',   my @oldmeta=&Apache::lonmysql::get_rows('metadata',
  "url LIKE BINARY '".   "url LIKE BINARY '".
  $metadata{'url'}."'");   $metadata{'url'}."'");
  if ($#oldmeta==0) {   if ($#oldmeta==0) {
 # there is an old value  # yes, there is one old entry, transfer to newmetadata
     for (my $i=0; $i<=$#columns; $i++) {      %newmetadata=&Apache::lonmeta::metadata_col_to_hash(@{$oldmeta[0]});
  $newmetadata{$columns[$i]}=$oldmeta[0]->[$i];  
     }  
 # remove old entry  # remove old entry
     $status=&Apache::lonmysql::remove_from_table      $status=&Apache::lonmysql::remove_from_table
  ('metadata','url',$metadata{'url'});   ('metadata','url',$metadata{'url'});
Line 1652  sub publishdirectory { Line 1649  sub publishdirectory {
     my $resdir=      my $resdir=
  $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cudom.'/'.$cuname.'/'.   $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cudom.'/'.$cuname.'/'.
  $thisdisfn;   $thisdisfn;
     $r->print('<h1>Directory <tt>'.$thisdisfn.'</tt></h1>'.      $r->print('<h1>'.&mt('Directory').' <tt>'.$thisdisfn.'</tt></h1>'.
       'Target: <tt>'.$resdir.'</tt><br />');        &mt('Target').': <tt>'.$resdir.'</tt><br />');
   
     my $dirptr=16384; # Mask indicating a directory in stat.cmode.      my $dirptr=16384; # Mask indicating a directory in stat.cmode.
   
Line 1691  sub publishdirectory { Line 1688  sub publishdirectory {
     if ($publishthis) {      if ($publishthis) {
                 &batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename);                  &batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename);
     } else {      } else {
  $r->print('<br />Skipping '.$filename.'<br />');   $r->print('<br />'.&mt('Skipping').' '.$filename.'<br />');
     }      }
     $r->rflush();      $r->rflush();
  }   }

Removed from v.1.155  
changed lines
  Added in v.1.156


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