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

Diff for /loncom/publisher/lonpublisher.pm between versions 1.262 and 1.267

version 1.262, 2009/07/30 09:42:25 version 1.267, 2010/06/02 19:09:42
Line 1121  sub publish { Line 1121  sub publish {
 # ------------------------------------------------------------- Save some stuff  # ------------------------------------------------------------- Save some stuff
         my %savemeta=();          my %savemeta=();
         foreach ('title') {          foreach ('title') {
             $savemeta{$_}=$metadatafields{$_};              if ($metadatafields{$_}) { $savemeta{$_}=$metadatafields{$_}; }
  }   }
 # ------------------------------------------ See if anything new in file itself  # ------------------------------------------ See if anything new in file itself
     
Line 1223  sub publish { Line 1223  sub publish {
     my $intr_scrout.='<br />'      my $intr_scrout.='<br />'
                     .'<form name="pubform" action="/adm/publish" method="post">';                      .'<form name="pubform" action="/adm/publish" method="post">';
     unless ($env{'form.makeobsolete'}) {      unless ($env{'form.makeobsolete'}) {
          my $thissrc=$source;
          $thissrc=~s{^/home/($match_username)/public_html}{/priv/$1};
        $intr_scrout.='<p class="LC_warning">'         $intr_scrout.='<p class="LC_warning">'
                     .&mt('Searching for your resource will be based on the following metadata. Please provide as much data as possible.')                      .&mt('Searching for your resource will be based on the following metadata. Please provide as much data as possible.')
                     .'</p>'                      .'</p>'
                     .'<p><input type="submit" value="'                      .'<p><input type="submit" value="'
                     .&mt('Finalize Publication')                      .&mt('Finalize Publication')
                     .'" /></p>';                      .'" /> <a href="'.$thissrc.'">'.&mt('Cancel').'</a></p>';
     }      }
     $intr_scrout.=&Apache::lonhtmlcommon::start_pick_box();      $intr_scrout.=&Apache::lonhtmlcommon::start_pick_box();
     $intr_scrout.=      $intr_scrout.=
Line 1668  sub phasetwo { Line 1670  sub phasetwo {
                   
         if (copy($target,$copyfile)) {          if (copy($target,$copyfile)) {
     print $logfile "Copied old target to ".$copyfile."\n";      print $logfile "Copied old target to ".$copyfile."\n";
             $r->print('<p>'.&mt('Copied old target file').'</p>');              $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Copied old target file')));
         } else {          } else {
     print $logfile "Unable to write ".$copyfile.':'.$!."\n";      print $logfile "Unable to write ".$copyfile.':'.$!."\n";
             $r->print("<span class=\"LC_error\">".&mt('Failed to copy old target').              $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Failed to copy old target').", $!",1));
  ", $!, ".&mt('FAIL')."</span>");  
     return 0;      return 0;
         }          }
                   
Line 1682  sub phasetwo { Line 1683  sub phasetwo {
                   
         if (copy($target.'.meta',$copyfile)) {          if (copy($target.'.meta',$copyfile)) {
     print $logfile "Copied old target metadata to ".$copyfile."\n";      print $logfile "Copied old target metadata to ".$copyfile."\n";
             $r->print('<p>'.&mt('Copied old metadata').'</p>')              $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Copied old metadata')));
         } else {          } else {
     print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";      print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
             if (-e $target.'.meta') {              if (-e $target.'.meta') {
                 $r->print(                   $r->print(&Apache::lonhtmlcommon::confirm_success(
                     "<span class=\"LC_error\">".                             &mt('Failed to write old metadata copy').", $!",1));
 &mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</span>");  
  return 0;   return 0;
     }      }
         }          }
Line 1721  sub phasetwo { Line 1721  sub phasetwo {
           
     if (copy($source,$copyfile)) {      if (copy($source,$copyfile)) {
         print $logfile "\nCopied original source to ".$copyfile."\n";          print $logfile "\nCopied original source to ".$copyfile."\n";
         $r->print('<p>'.&mt('Copied source file').'</p>');          $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Copied source file')));
     } else {      } else {
         print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";          print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
         $r->print("<span class=\"LC_error\">".          $r->print(&Apache::lonhtmlcommon::confirm_success(
     &mt('Failed to copy source').", $!, ".&mt('FAIL')."</span>");      &mt('Failed to copy source').", $!",1));
  return 0;   return 0;
     }      }
           
   # ---------------------------------------------- Delete local tmp-preview files
       unlink($copyfile.'.tmp');
 # --------------------------------------------------------------- Copy Metadata  # --------------------------------------------------------------- Copy Metadata
   
     $copyfile=$copyfile.'.meta';      $copyfile=$copyfile.'.meta';
           
     if (copy($source.'.meta',$copyfile)) {      if (copy($source.'.meta',$copyfile)) {
         print $logfile "\nCopied original metadata to ".$copyfile."\n";          print $logfile "\nCopied original metadata to ".$copyfile."\n";
         $r->print('<p>'.&mt('Copied metadata').'</p>');          $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Copied metadata')));
     } else {      } else {
         print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";          print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";
         $r->print(          $r->print(&Apache::lonhtmlcommon::confirm_success(
             "<span class=\"LC_error\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</span>");                    &mt('Failed to write metadata copy').", $!",1));
  return 0;   return 0;
     }      }
     $r->rflush;      $r->rflush;
Line 1747  sub phasetwo { Line 1749  sub phasetwo {
 # ------------------------------------------------------------- Trigger updates  # ------------------------------------------------------------- Trigger updates
     push(@{$modified_urls},[$target,$source]);      push(@{$modified_urls},[$target,$source]);
     unless ($registered_cleanup) {      unless ($registered_cleanup) {
  $r->register_cleanup(\&notify);          my $handlers = $r->get_handlers('PerlCleanupHandler');
           $r->set_handlers('PerlCleanupHandler' => [\&notify,@{$handlers}]);
  $registered_cleanup=1;   $registered_cleanup=1;
     }      }
   
Line 1770  sub phasetwo { Line 1773  sub phasetwo {
         my $thissrcdir=$thissrc;          my $thissrcdir=$thissrc;
         $thissrcdir=~s/\/[^\/]+$/\//;          $thissrcdir=~s/\/[^\/]+$/\//;
                   
         $r->print(&Apache::lonhtmlcommon::start_funclist());          $r->print(&Apache::loncommon::head_subbox(
         unless ($env{'request.role'}=~/^(aa)/) {              &Apache::lonhtmlcommon::start_funclist().
             $r->print(              &Apache::lonhtmlcommon::add_item_funclist(
                 &Apache::lonhtmlcommon::add_item_funclist(                  '<a href="'.$thisdistarget.'">'.
                     '<a href="'.$thisdistarget.'">'                  &mt('View Published Version').
                    .&mt('View Published Version')                  '</a>').
                    .'</a>')              &Apache::lonhtmlcommon::add_item_funclist(
             );                  '<a href="'.$thissrc.'">'.
         }                  &mt('Back to Source').
         $r->print(                  '</a>').
             &Apache::lonhtmlcommon::add_item_funclist(              &Apache::lonhtmlcommon::add_item_funclist(
                 '<a href="'.$thissrc.'">'                  '<a href="'.$thissrcdir.'">'.
                .&mt('Back to Source')                  &mt('Back to Source Directory').
                .'</a>')                  '</a>').
            .&Apache::lonhtmlcommon::add_item_funclist(              &Apache::lonhtmlcommon::end_funclist())
                 '<a href="'.$thissrcdir.'">'  
                .&mt('Back to Source Directory')  
                .'</a>')  
            .&Apache::lonhtmlcommon::end_funclist()  
         );          );
     }      }
     return 1;      return 1;
Removed from v.1.262  
changed lines
  Added in v.1.267

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