--- loncom/publisher/lonretrieve.pm 2001/12/04 15:34:57 1.15 +++ loncom/publisher/lonretrieve.pm 2003/05/19 21:53:03 1.22 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to retrieve an old version of a file # -# $Id: lonretrieve.pm,v 1.15 2001/12/04 15:34:57 albertel Exp $ +# $Id: lonretrieve.pm,v 1.22 2003/05/19 21:53:03 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,13 +30,17 @@ # # (TeX Content Handler # +# YEAR=2000 # 05/29/00,05/30,10/11 Gerd Kortemeyer) # # 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer +# YEAR=2001 # 03/23 Guy Albertelli # 03/24,03/29 Gerd Kortemeyer) # # 03/31,04/03,05/02,05/09,06/23,08/20 Gerd Kortemeyer +# +### package Apache::lonretrieve; @@ -45,7 +49,9 @@ use Apache::File; use File::Copy; use Apache::Constants qw(:common :http :methods); use Apache::loncacc; +use Apache::loncommon(); +# ------------------------------------ Interface for selecting previous version sub phaseone { my ($r,$fn,$uname,$udom)=@_; my $docroot=$r->dir_config('lonDocRoot'); @@ -71,7 +77,7 @@ sub phaseone { my $filename; opendir(DIR,$resdir); while ($filename=readdir(DIR)) { - if ($filename=~/^$main\.(\d+)\.$suffix$/) { + if ($filename=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/) { my $version=$1; my ($rdev,$rino,$rmode,$rnlink, $ruid,$rgid,$rrdev,$rsize, @@ -82,11 +88,11 @@ sub phaseone { localtime($rmtime).''. ''. 'Metadata Version '.$version.''); - if (&Apache::lonnet::fileembstyle($suffix) eq 'ssi') { + if (&Apache::loncommon::fileembstyle($suffix) eq 'ssi') { $r->print( '  Diffs with Version '.$version.''); } $r->print(''); @@ -101,11 +107,11 @@ sub phaseone { 'Current'.localtime($rmtime). ''. 'Metadata current version'); - if (&Apache::lonnet::fileembstyle($suffix) eq 'ssi') { + if (&Apache::loncommon::fileembstyle($suffix) eq 'ssi') { $r->print( '  Diffs with current Version'); } $r->print('

'. @@ -117,6 +123,7 @@ sub phaseone { } } +# ---------------------------------- Interface for presenting specified version sub phasetwo { my ($r,$fn,$uname,$udom)=@_; if ($ENV{'form.version'}) { @@ -158,6 +165,7 @@ sub phasetwo { } } +# ---------------------------------------------------------------- Main Handler sub handler { my $r=shift; @@ -167,17 +175,8 @@ sub handler { # Get query string for limited number of parameters - map { - my ($name, $value) = split(/=/,$_); - $value =~ tr/+/ /; - $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; - if ($name eq 'filename') { - unless ($ENV{'form.'.$name}) { - $ENV{'form.'.$name}=$value; - } - } - } (split(/&/,$ENV{'QUERY_STRING'})); - + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['filename']); if ($ENV{'form.filename'}) { $fn=$ENV{'form.filename'}; @@ -215,8 +214,7 @@ sub handler { $r->print('LON-CAPA Construction Space'); - $r->print( - ''); + $r->print(&Apache::loncommon::bodytag('Retrieve Published Resources')); $r->print('

Retrieve previous versions of '.$fn.'

'); @@ -239,3 +237,68 @@ 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