--- loncom/publisher/lonretrieve.pm 2008/12/21 04:38:43 1.34.2.2 +++ loncom/publisher/lonretrieve.pm 2008/11/10 14:11:08 1.35 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to retrieve an old version of a file # -# $Id: lonretrieve.pm,v 1.34.2.2 2008/12/21 04:38:43 raeburn Exp $ +# $Id: lonretrieve.pm,v 1.35 2008/11/10 14:11:08 jms Exp $ # # Copyright Michigan State University Board of Trustees # @@ -28,6 +28,71 @@ # ### +=head1 NAME + +Apache::lonretrieve - retrieves an old version of a file + +=head1 SYNOPSIS + +Invoked by /etc/httpd/conf/srm.conf: + + + PerlAccessHandler Apache::lonacc + SetHandler perl-script + PerlHandler Apache::lonretrieve + ErrorDocument 403 /adm/login + ErrorDocument 404 /adm/notfound.html + ErrorDocument 406 /adm/unauthorized.html + ErrorDocument 500 /adm/errorhandler + + +=head1 INTRODUCTION + +This module retrieves an old published version of a file. + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + +=head1 HANDLER SUBROUTINE + +This routine is called by Apache and mod_perl. + +=over 4 + +=item * + +Get query string for limited number of parameters + +=item * + +Start page output + +=item * + +print phase relevant output + +=item * + +(phase one is to select version; phase two retrieves version) + +=back + +=head1 OTHER SUBROUTINES + +=over 4 + +=item * + +phaseone() : Interface for selecting previous version. + +=item * + +phasetwo() : Interface for presenting specified version. + +=back + +=cut + package Apache::lonretrieve; use strict; @@ -127,18 +192,18 @@ sub phaseone { $r->print(&Apache::loncommon::end_data_table_row(). &Apache::loncommon::end_data_table(). '

'.''. - &mt('Retrieval of an old version will overwrite the file currently in construction space.').'

'); + &mt('Retrieval of an old version will overwrite the file currently in construction space').'

'); if (!$is_meta) { $r->print('

'.''. - &mt('This will only retrieve the resource. If you want to retrieve the metadata you will need to do that separately.'). + &mt('This will only retrieve the resource, if you want to retrieve the metadata you will need to do that separately.'). '

'); } $r->print(''); } else { - $r->print('

'.&mt('No previous versions published.').'

'); + $r->print('

'.&mt('No previous versions published.').'

'); } - $r->print('

'.&mt('Back to [_1]',''.$fn.'') - .'

'); + $r->print('

'.&mt('Back to').' '.$fn. + '

'); } # ---------------------------------- Interface for presenting specified version @@ -166,32 +231,25 @@ sub phasetwo { if ($is_meta) { $logname =~ s/\.meta$//; } $logname = $ctarget.'.log'; unless ($logfile=Apache::File->new('>>'.$logname)) { - $r->print('' - .&mt('No write permission to user directory, FAIL') - .''); + $r->print( + ''.&mt('No write permission to user directory, FAIL').''); } print $logfile "\n\n================= Retrieve ".localtime()." ================\n". "Version: $version\nSource: $csource\nTarget: $ctarget\n"; $r->print('

'.&mt('Copying file').': '); if (copy($csource,$ctarget)) { - $r->print('' - .&mt('ok') - .''); + $r->print('ok

'); print $logfile "Copied sucessfully.\n\n"; } else { my $error=$!; - $r->print('' - .&mt('Copy failed: [_1]',$error) - .''); + $r->print('fail, '.$error.'

'); print $logfile "Copy failed: $error\n\n"; } - $r->print('

' - .'

' - .&mt('Back to [_1]',$fn) - .'

'); + $r->print(''.&mt('Back to').' '.$fn.''); } else { - $r->print('

'.&mt('Please pick a version to retrieve:').'

'); + $r->print(''.&mt('Please pick a version to retrieve').'

'); &phaseone($r,$fn,$uname,$udom); } } @@ -223,7 +281,7 @@ sub handler { if ($env{'form.filename'}) { $fn=$env{'form.filename'}; - $fn=~s/^https?\:\/\/[^\/]+//; + $fn=~s/^http\:\/\/[^\/]+//; } else { $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}. ' unspecified filename for retrieval', $r->filename); @@ -258,10 +316,7 @@ sub handler { $r->print(&Apache::loncommon::start_page('Retrieve Published Resources')); - $r->print('

' - .&mt('Retrieve previous versions of [_1]' - ,''.$fn.'') - .'

'); + $r->print('

'.&mt('Retrieve previous versions of').' '.$fn.'

'); if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { $r->print('

'.&mt('Co-Author').': '.$uname. @@ -283,67 +338,4 @@ sub handler { 1; __END__ -=head1 NAME - -Apache::lonretrieve - retrieves an old version of a file - -=head1 SYNOPSIS - -Invoked by /etc/httpd/conf/srm.conf: - - - PerlAccessHandler Apache::lonacc - SetHandler perl-script - PerlHandler Apache::lonretrieve - ErrorDocument 403 /adm/login - ErrorDocument 404 /adm/notfound.html - ErrorDocument 406 /adm/unauthorized.html - ErrorDocument 500 /adm/errorhandler - - -=head1 INTRODUCTION - -This module retrieves an old published version of a file. - -This is part of the LearningOnline Network with CAPA project -described at http://www.lon-capa.org. - -=head1 HANDLER SUBROUTINE - -This routine is called by Apache and mod_perl. - -=over 4 - -=item * - -Get query string for limited number of parameters - -=item * - -Start page output - -=item * - -print phase relevant output - -=item * - -(phase one is to select version; phase two retrieves version) - -=back - -=head1 OTHER SUBROUTINES - -=over 4 - -=item * - -phaseone() : Interface for selecting previous version. - -=item * - -phasetwo() : Interface for presenting specified version. - -=back -=cut