[BACK]Return to lonpublisher.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / publisher

Diff for /loncom/publisher/lonpublisher.pm between versions 1.296 and 1.298

version 1.296, 2016/06/19 01:08:01 version 1.298, 2021/06/03 13:59:44
Line 1875  sub phasetwo { Line 1875  sub phasetwo {
     $metadatafields{'url'} = $distarget;      $metadatafields{'url'} = $distarget;
     $metadatafields{'version'} = 'current';      $metadatafields{'version'} = 'current';
   
     my ($error,$success) = &store_metadata(%metadatafields);      my $crsauthor;
     if ($success) {      if ($env{'request.course.id'}) {
  $output .= '<p>'.&mt('Synchronized SQL metadata database').'</p>';          my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
  print $logfile "\nSynchronized SQL metadata database";          my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     } else {          if ($distarget =~ m{^/res/$cdom/$cnum}) {
  $output .= $error;              $crsauthor = 1;
  print $logfile "\n".$error;          }
     }      }
     unless ($usebuffer) {      unless ($crsauthor) {
         $r->print($output);          my ($error,$success) = &store_metadata(%metadatafields);
         $output = '';          if ($success) {
       $output .= '<p>'.&mt('Synchronized SQL metadata database').'</p>';
       print $logfile "\nSynchronized SQL metadata database";
           } else {
       $output .= $error;
       print $logfile "\n".$error;
           }
           unless ($usebuffer) {
               $r->print($output);
               $output = '';
           }
     }      }
 # --------------------------------------------- Delete author resource messages  # --------------------------------------------- Delete author resource messages
     my $delresult=&Apache::lonmsg::del_url_author_res_msg($target);       my $delresult=&Apache::lonmsg::del_url_author_res_msg($target); 
Line 2267  sub publishdirectory { Line 2277  sub publishdirectory {
   &checkbox('forcerepub','force republication of previously published files').    &checkbox('forcerepub','force republication of previously published files').
                   &checkbox('obsolete','make file(s) obsolete').                    &checkbox('obsolete','make file(s) obsolete').
   &checkbox('forceoverride','force directory level metadata over existing').    &checkbox('forceoverride','force directory level metadata over existing').
                     &checkbox('excludeunpub','exclude currently unpublished files').
                   &common_access('dist',&mt('apply common copyright/distribution'),                    &common_access('dist',&mt('apply common copyright/distribution'),
                                  ['default','domain','custom']).                                   ['default','domain','custom']).
                   &common_access('source',&mt('apply common source availability'),                    &common_access('source',&mt('apply common source availability'),
Line 2299  sub publishdirectory { Line 2310  sub publishdirectory {
  }   }
     } elsif ((&Apache::loncommon::fileembstyle($extension) ne 'hdn') &&      } elsif ((&Apache::loncommon::fileembstyle($extension) ne 'hdn') &&
      ($filename!~/^[\#\.]/) && ($filename!~/\~$/)) {       ($filename!~/^[\#\.]/) && ($filename!~/\~$/)) {
 # find out publication status and/or exiting metadata  # find out publication status and/or existing metadata
  my $publishthis=0;   my $publishthis=0;
  if (-e $resdir.'/'.$filename) {   if (-e $resdir.'/'.$filename) {
     my ($rdev,$rino,$rmode,$rnlink,      my ($rdev,$rino,$rmode,$rnlink,
Line 2317  sub publishdirectory { Line 2328  sub publishdirectory {
     }      }
  } else {   } else {
 # never published  # never published
     $publishthis=1;      unless ($env{'form.excludeunpub'}) {
           $publishthis=1;
       }
  }   }
   
  if ($publishthis) {   if ($publishthis) {
Removed from v.1.296  
changed lines
  Added in v.1.298

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