--- loncom/publisher/testbankimport.pm 2010/11/27 22:43:32 1.26 +++ loncom/publisher/testbankimport.pm 2011/11/02 23:43:37 1.33 @@ -1,5 +1,5 @@ # Handler for parsing text upload problem descriptions into .problems -# $Id: testbankimport.pm,v 1.26 2010/11/27 22:43:32 raeburn Exp $ +# $Id: testbankimport.pm,v 1.33 2011/11/02 23:43:37 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -485,7 +485,7 @@ function backPage() { # ---------------------------------------------------------------- Display Zero sub display_zero { - my ($r,$uname,$fn,$page,$webpath) = @_; + my ($r,$fn,$page,$webpath) = @_; my $go_default = 'NextPage'; if ($fn eq '') { $r->print(''.&mt('Incomplete file upload').' '.&mt('Return to the [_1]construction space menu[_2] to upload a file','','')); @@ -512,14 +512,14 @@ sub display_zero { &Apache::lonhtmlcommon::topic_bar(1,&mt('Optional: create a sub-directory in which the testbank questions will be saved')). &mt('By default, LON-CAPA problems generated from the testbank file will be stored in the current directory.').' '.&mt('To store them in a new sub-directory:'). ' '. - &page_footer($env{'form.newdir'},$uname,$fn,$page,$webpath).' + &page_footer($env{'form.newdir'},$fn,$page,$webpath).' '); } # ---------------------------------------------------------------- Display One sub display_one { - my ($r,$uname,$fn,$page,$textref,$header) = @_; + my ($r,$fn,$page,$textref,$header) = @_; my %topics; $topics{2} = &mt('Select the format of the question number - e.g., 1, 1., 1), (1 or (1) - ').'
'. &mt('You will indicate the question type and the question number range for each of the blocks on the next page.').'
'.&mt('No questions were selected for conversion.').'
'. - &page_footer($env{'form.newdir'},$uname,$fn,$page,$webpath,$subdir,$state).''); + &page_footer($env{'form.newdir'},$fn,$page,$webpath,$subdir,$state).''); } elsif (($destdir ne '') && (-e $destdir)) { my (@qn_file,@result,@numid); my $qcount = 0; @@ -1130,11 +1130,11 @@ sub final_display { $r->print(''.&mt('The following files already existed, and were not overwritten so these problems generated from the testbank have not been saved:').'
'.$existing.'
'.&mt('No destination directory was available so import of questions could not proceed.').'
'. - &page_footer($env{'form.newdir'},$uname,$fn,$page,$webpath,$subdir,$state).''); + &page_footer($env{'form.newdir'},$fn,$page,$webpath,$subdir,$state).''); } return; } @@ -1159,7 +1159,7 @@ sub show_uploaded_data { } sub page_footer { - my ($newdir,$uname,$fn,$page,$webpath,$subdir,$state) = @_; + my ($newdir,$fn,$page,$webpath,$subdir,$state) = @_; my $prevval = &mt('Previous Page'); my $nextval = &mt('Next Page'); my $prevclick = 'javascript:backPage();'; @@ -1184,7 +1184,6 @@ sub page_footer { } my $output = ' - @@ -1330,7 +1329,11 @@ sub create_mcq { my $numfoils = scalar(@{$qstnref}) - 1; my $datestamp = localtime; my $numansrs = scalar(@{$answerref}); - my $output = '' + $output .= '
' .&mt('Co-Author [_1]',$uname.':'.$udom) .'
'; } @@ -1810,48 +1813,39 @@ sub print_header { # ---------------------------------------------------------------- Main Handler sub handler { my $r=shift; - my $uname; - my $udom; - my $javascript = ''; - my $page_name = ''; - my $current_page = ''; - my $qcount = ''; - my $title = 'Upload testbank questions to Construction Space'; - if ($env{'form.uploaduname'}) { - $env{'form.filename'}='/priv/'.$env{'form.uploaduname'}.'/'. - $env{'form.filename'}; - } - ($uname,$udom)= - &Apache::loncacc::constructaccess($env{'form.filename'}, - $r->dir_config('lonDefDomain')); - unless (($uname) && ($udom)) { - $r->log_reason($uname.':'.$udom.' trying to convert testbank file '. - $env{'form.filename'}.' - not authorized',$r->filename); - return HTTP_NOT_ACCEPTABLE; + my $fn=$env{'form.filename'}; + + if ($env{'form.filename1'}) { + $fn=$env{'form.filename1'}.$env{'form.filename2'}; } + $fn=~s{\+}{}g; - my ($fn,$filename); - if ($env{'form.filename'}) { - $fn=$env{'form.filename'}; - $fn=~s/^https?\:\/\/[^\/]+\///; - $fn=~s/^\///; - $fn=~s{(~|priv/)($LONCAPA::username_re)}{}; - $fn=~s/\/+/\//g; - } else { + unless ($fn) { $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}. ' unspecified filename for upload', $r->filename); return HTTP_NOT_FOUND; } + my ($uname,$udom) = &Apache::loncacc::constructaccess($fn); + if (($uname eq '') || ($udom eq '')) { + $r->log_reason($uname.':'.$udom.' trying to convert testbank file '. + $fn.' - not authorized',$r->filename); + return HTTP_NOT_ACCEPTABLE; + } + + my $javascript = ''; + my $page_name = ''; + my $current_page = ''; + my $qcount = ''; + my $title = 'Upload testbank questions to Construction Space'; + # ----------------------------------------------------------- Start page output &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - my ($filename,$pathname) = &File::Basename::fileparse($fn); - my $webpath = '/priv/'.$uname.$pathname; - my $urlpath = '/~'.$uname.$pathname; - my $dirpath = '/home/'.$uname.'/public_html'.$pathname; + my ($filename,$webpath) = &File::Basename::fileparse($fn); + my $dirpath = $r->dir_config('lonDocRoot').$webpath; my ($res,$subdir,$badfile,$textref,$header,$css,$js,%loadentries,@pages,%names); if ($env{'form.phase'} eq 'three') { @@ -1873,8 +1867,8 @@ sub handler { } } ($res,$badfile,$textref,$header,$css,$js) = - &parse_datafile($r,$uname,$filename,$pathname,$dirpath,$urlpath, - $page_name,$subdir,$env{'form.timestamp'}); + &parse_datafile($r,$filename,$dirpath,$webpath,$page_name, + $subdir,$env{'form.timestamp'}); if ($page_name eq 'Welcome') { &jscript_zero($webpath,\$javascript); } elsif ($page_name eq 'Blocks') { @@ -1906,23 +1900,40 @@ sub handler { } $r->print(&print_header($uname,$udom,$javascript,\%loadentries,$title, - $current_page,\@pages,\%names)); + $current_page,\@pages,\%names)); - if ($env{'form.phase'} eq 'three') { - if ($env{'form.action'} eq 'upload_embedded') { - $r->print(&Apache::lonupload::phasethree($r,$fn,$uname,$udom,'testbank')); + if (($env{'form.phase'} eq 'four') || ($env{'form.phase'} eq 'three')) { + if ($env{'form.phase'} eq 'four') { + $r->print(&Apache::lonupload::phasefour($r,$fn,$uname,$udom,'testbank')); + my $current_page = 0; + my $js; + &jscript_zero($webpath,\$js); + $js = ''; + $r->print($js); + &display_zero($r,$fn,$current_page,$webpath); + } elsif ($env{'form.phase'} eq 'three') { + if ($env{'form.action'} eq 'upload_embedded') { + my ($result,$flag) = + &Apache::lonupload::phasethree($r,$fn,$uname,$udom,'testbank'); + $r->print($result); + if ($flag eq 'modify_orightml') { + undef($page_name); + $r->print(''); + } + } } if ($badfile) { - &file_error($r,$uname,$fn,$current_page,$webpath,$res); - } else { - &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_two ($r,$uname,$fn,$current_page,$textref,$header,$qcount) if $page_name eq 'Format'; - &display_three ($r,$uname,$fn,$current_page,$textref,$res,$header,$urlpath,$qcount) if $page_name eq 'Target'; - &final_display ($r,$uname,$fn,$current_page,$textref,$res,$header,$css,$js,$webpath,$dirpath,$subdir) if $page_name eq 'Confirmation'; + &file_error($r,$fn,$current_page,$webpath,$res); + } else { + &display_zero ($r,$fn,$current_page,$webpath) if $page_name eq 'Welcome'; + &display_one ($r,$fn,$current_page,$textref,$header) if $page_name eq 'Blocks'; + &display_two ($r,$fn,$current_page,$textref,$header,$qcount) if $page_name eq 'Format'; + &display_three ($r,$fn,$current_page,$textref,$res,$header,$webpath,$qcount) if $page_name eq 'Target'; + &final_display ($r,$fn,$current_page,$textref,$res,$header,$css,$js,$webpath,$dirpath,$subdir) if $page_name eq 'Confirmation'; } } elsif ($env{'form.phase'} eq 'two') { - my ($result,$flag) = &Apache::lonupload::phasetwo($r,$fn,$uname,$udom,'testbank'); + my ($result,$flag) = &Apache::lonupload::phasetwo($r,$fn,'testbank'); $r->print($result); if ($flag eq 'ok') { my $current_page = 0; @@ -1930,13 +1941,13 @@ sub handler { &jscript_zero($webpath,\$js); $js = ''; $r->print($js); - &display_zero($r,$uname,$fn,$current_page,$webpath); + &display_zero($r,$fn,$current_page,$webpath); } elsif ($flag eq 'embedded') { $r->print($js.''); + &page_footer('',$fn).''); } } else { - &Apache::lonupload::phaseone($r,$fn,$uname,$udom,'testbank'); + &Apache::lonupload::phaseone($r,$fn,'testbank'); } $r->print(&Apache::loncommon::end_page()); return OK;