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

Diff for /loncom/publisher/testbankimport.pm between versions 1.16 and 1.17

version 1.16, 2008/07/08 07:17:46 version 1.17, 2008/09/22 01:53:33
Line 1163  sub page_footer { Line 1163  sub page_footer {
     my $nextval = &mt('Next Page');      my $nextval = &mt('Next Page');
     my $prevclick = 'javascript:backPage();';      my $prevclick = 'javascript:backPage();';
     my $nextclick = 'javascript:nextPage();';      my $nextclick = 'javascript:nextPage();';
     my $go = '';       my $go = '';
     if ($page == 0) {      if (($page == 0) || ($state eq 'badfile')) {
         $go = 'NextPage';          $go = 'NextPage';
         $prevval = &mt('Exit Now');          $prevval = &mt('Exit Now');
         $prevclick = 'javascript:location.href='."'$webpath';";          $prevclick = 'javascript:location.href='."'$webpath';";
Line 1195  sub page_footer { Line 1195  sub page_footer {
          <td>           <td>
           <input type="button" name="backpage" value="'.$prevval.'" onclick="'.$prevclick.'" />            <input type="button" name="backpage" value="'.$prevval.'" onclick="'.$prevclick.'" />
          </td>';           </td>';
         if ($page < 4)  {          if (($page < 4) && ($state ne 'badfile'))  {
             $output .= '              $output .= '
          <td>&nbsp;</td>           <td>&nbsp;</td>
          <td>           <td>
Line 1599  sub probfile_name { Line 1599  sub probfile_name {
 }  }
   
 sub file_error {  sub file_error {
     my ($r,$uname,$fn,$current_page);      my ($r,$uname,$fn,$current_page,$webpath,$res) = @_;
     $r->print("No data here");      $r->print('<p><form name="display" method="post" action="/adm/testbank">'.&mt('The file you uploaded does not appear to be in the correct format.').
                 '</p><p>'.&mt('Extraction of questions is only possible for the following file types:').
                 '<ul><li>'.&mt('plain text').'</li><li>RTF</li><li>HTML</li></ul>'.
                 &mt('The file type identified for the file you uploaded is [_1].','<b>'.$res.'</b>').'</p>');
       $r->print(&page_footer($env{'form.newdir'},$uname,$fn,$current_page,$webpath,undef,'badfile').
                '</form>');
       return;
 }  }
   
 sub parse_datafile {  sub parse_datafile {
Line 1875  sub handler { Line 1881  sub handler {
             $r->print(&Apache::lonupload::phasethree($r,$fn,$uname,$udom,'testbank'));              $r->print(&Apache::lonupload::phasethree($r,$fn,$uname,$udom,'testbank'));
         }          }
         if ($badfile) {          if ($badfile) {
             &file_error($r,$uname,$fn,$current_page);              &file_error($r,$uname,$fn,$current_page,$webpath,$res);
         } else {                  } else {        
             &display_zero ($r,$uname,$fn,$current_page,$webpath) if $page_name eq 'Welcome';              &display_zero ($r,$uname,$fn,$current_page,$webpath) if $page_name eq 'Welcome';
             &display_one ($r,$uname,$fn,$current_page,$textref,$header) if $page_name eq 'Blocks';              &display_one ($r,$uname,$fn,$current_page,$textref,$header) if $page_name eq 'Blocks';
Removed from v.1.16  
changed lines
  Added in v.1.17

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