--- loncom/publisher/lonretrieve.pm 2005/04/07 06:56:27 1.27 +++ loncom/publisher/lonretrieve.pm 2006/04/06 22:15:19 1.30 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to retrieve an old version of a file # -# $Id: lonretrieve.pm,v 1.27 2005/04/07 06:56:27 albertel Exp $ +# $Id: lonretrieve.pm,v 1.30 2006/04/06 22:15:19 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -63,9 +63,17 @@ sub phaseone { &mt('Version').''. ''.&mt('Published on ...').''. ''.&mt('Metadata').''); - my $filename; + opendir(DIR,$resdir); - while ($filename=readdir(DIR)) { + my @files = grep(/^\Q$main\E\.(\d+)\.\Q$suffix\E$/,readdir(DIR)); + @files = sort { + my ($aver) = ($a=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/); + my ($bver) = ($b=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/); + return $aver <=> $bver; + } (@files); + closedir(DIR); + + foreach my $filename (@files) { if ($filename=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/) { my $version=$1; my $rmtime=&Apache::lonnet::metadata($resdir.'/'.$filename,'lastrevisiondate'); @@ -87,7 +95,7 @@ sub phaseone { closedir(DIR); my $rmtime=&Apache::lonnet::metadata($resfn,'lastrevisiondate'); $r->print(''. - ''.&mt('Currently public version').''.localtime($rmtime). + ''.&mt('Currently published version').''.localtime($rmtime). ''. &mt('Metadata current version').''); if (&Apache::loncommon::fileembstyle($suffix) eq 'ssi') { @@ -197,9 +205,7 @@ sub handler { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - $r->print('LON-CAPA Construction Space'); - - $r->print(&Apache::loncommon::bodytag('Retrieve Published Resources')); + $r->print(&Apache::loncommon::start_page('Retrieve Published Resources')); $r->print('

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

'); @@ -217,7 +223,7 @@ sub handler { &phaseone($r,$fn,$uname,$udom); } - $r->print(''); + $r->print(&Apache::loncommon::end_page()); return OK; }