From 548804a56d4a454898b550fba5bd2853e6638d99 Mon Sep 17 00:00:00 2001 From: Dean Hamstead Date: Tue, 10 Jan 2012 15:35:26 +1100 Subject: [PATCH] updates --- src/lib/Makefile.am | 47 ------------------------------------ src/lib/Torrus/DB.pm | 2 +- src/lib/Torrus/PSGI.pm | 3 ++- src/lib/Torrus/Renderer/Cache.pm | 2 +- src/lib/Torrus/Renderer/Frontpage.pm | 40 +++++++++++++++--------------- 5 files changed, 23 insertions(+), 71 deletions(-) delete mode 100644 src/lib/Makefile.am diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am deleted file mode 100644 index 5adf252..0000000 --- a/src/lib/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ - -# Copyright (C) 2002 Stanislav Sinyagin -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. - -# Stanislav Sinyagin -# - - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(perllibdir) - find * -type d ! -name CVS -print >list.tmp - for d in `cat list.tmp`; do \ - $(mkinstalldirs) $(DESTDIR)$(perllibdir)/$$d; done - find * \( -name '*.pm' \) -type f -print >list.tmp - for f in `cat list.tmp`; do \ - $(INSTALL_DATA) $$f $(DESTDIR)$(perllibdir)/$$f; done - rm -f list.tmp - - -uninstall-local: - find * -type d ! -name CVS -print >list.tmp - for d in `cat list.tmp`; do \ - rm -r $(DESTDIR)$(perllibdir)/$$d; done - rm -f list.tmp - - -dist-hook: - find * -type d ! -name CVS -print >list.tmp - for d in `cat list.tmp`; do \ - mkdir $(distdir)/$$d; done - find * \( -name '*.pm' -o -name '*.txt' \) -type f -print >list.tmp - for f in `cat list.tmp`; do \ - cp $$f $(distdir)/$$f; done - rm -f list.tmp diff --git a/src/lib/Torrus/DB.pm b/src/lib/Torrus/DB.pm index 54ae928..a9a77bb 100644 --- a/src/lib/Torrus/DB.pm +++ b/src/lib/Torrus/DB.pm @@ -14,7 +14,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -# $Id$ +# $Id: DB.pm,v 1.1 2012/01/08 23:58:23 root Exp root $ # Stanislav Sinyagin # Dean Hamstead diff --git a/src/lib/Torrus/PSGI.pm b/src/lib/Torrus/PSGI.pm index 4c6a212..16c25cc 100644 --- a/src/lib/Torrus/PSGI.pm +++ b/src/lib/Torrus/PSGI.pm @@ -6,6 +6,7 @@ use warnings; # because Miyagawa knows much more than SS about perl, and Ive written mod_perl1/2/fcgi adapters enough times now in my life use Plack::Request; +use Plack::Response; use JSON (); @@ -241,7 +242,7 @@ sub report_error } else { - my $res = Plack::Response->new(200,{'Content-type' => 'text/plain', 'Expires' => 'now'}); + my $res = Plack::Response->new(500,{'Content-type' => 'text/plain', 'Expires' => 'now'}); $res->body('Error: ' . $msg); return $res } diff --git a/src/lib/Torrus/Renderer/Cache.pm b/src/lib/Torrus/Renderer/Cache.pm index dbe7532..07349c7 100644 --- a/src/lib/Torrus/Renderer/Cache.pm +++ b/src/lib/Torrus/Renderer/Cache.pm @@ -104,7 +104,7 @@ sub getCache $keystring = $self->cacheKey($keystring,$options); - my $cacheval = $self->get( $keystring ); + my $cacheval = $self->{db}->get( $keystring ); if( defined($cacheval) ) { diff --git a/src/lib/Torrus/Renderer/Frontpage.pm b/src/lib/Torrus/Renderer/Frontpage.pm index 98d0dad..606b9e8 100644 --- a/src/lib/Torrus/Renderer/Frontpage.pm +++ b/src/lib/Torrus/Renderer/Frontpage.pm @@ -35,23 +35,22 @@ sub renderUserLogin { my $self = shift; my %new_options = @_; + my $cache = $self->{cache}; - if( %new_options ) - { - $self->{'options'} = \%new_options; - } + $self->{'options'} = \%new_options + if( %new_options ); my($t_render, $t_expires, $filename, $mime_type); - my $cachekey = $self->cacheKey( 'LOGINSCREEN', $self->{options} ); + my $cachekey = $cache->cacheKey( 'LOGINSCREEN', $self->{options} ); ($t_render, $t_expires, $filename, $mime_type) = - $self->getCache( $cachekey ); + $cache->getCache( $cachekey ); # We don't check the expiration time for login screen if( not defined( $filename ) ) { - $filename = $self->newCacheFileName($cachekey, + $filename = $cache->newCacheFileName($cachekey, $self->{options} ); } @@ -83,7 +82,7 @@ sub renderUserLogin # Pass the options from Torrus::Renderer::render() to Template - while( my( $opt, $val ) = each( %{$self->{'options'}} ) ) + while( my( $opt, $val ) = each %{$self->{'options'}} ) { $ttvars->{$opt} = $val; } @@ -100,7 +99,7 @@ sub renderUserLogin } else { - $self->setCache($cachekey, time(), $t_expires, $filename, $mime_type); + $cache->setCache($cachekey, time(), $t_expires, $filename, $mime_type); @ret = ($outfile, $mime_type, $t_expires - time()); } @@ -114,21 +113,20 @@ sub renderTreeChooser { my $self = shift; my %new_options = @_; + my $cache = $self->{cache}; - if( %new_options ) - { - $self->{'options'} = \%new_options; - } + $self->{'options'} = \%new_options + if( %new_options ); my($t_render, $t_expires, $filename, $mime_type); my $uid = $self->{'options'}->{'uid'} || ''; - my $cachekey = $self->cacheKey( $uid . ':' . 'TREECHOOSER', + my $cachekey = $cache->cacheKey( $uid . ':' . 'TREECHOOSER', $self->{options} ); ($t_render, $t_expires, $filename, $mime_type) = - $self->getCache( $cachekey ); + $cache->getCache( $cachekey ); if( defined( $filename ) ) { @@ -141,7 +139,7 @@ sub renderTreeChooser } else { - $filename = $self->newCacheFileName( $cachekey ); + $filename = $cache->newCacheFileName( $cachekey ); } my $outfile = File::Spec->catfile($Torrus::Global::cacheDir,$filename); @@ -162,12 +160,12 @@ sub renderTreeChooser my $ttvars = { - 'treeNames' => sub{ return Torrus::SiteConfig::listTreeNames() }, - 'treeDescr' => sub{ return + 'treeNames' => sub{ return Torrus::SiteConfig::listTreeNames() }, + 'treeDescr' => sub{ return Torrus::SiteConfig::treeDescription($_[0]) } , - 'url' => sub { return $Torrus::Renderer::rendererURL . '/' . $_[0] }, - 'pathUrl' => sub { return $Torrus::Renderer::rendererURL . '/' . + 'url' => sub { return $Torrus::Renderer::rendererURL . '/' . $_[0] }, + 'pathUrl' => sub { return $Torrus::Renderer::rendererURL . '/' . $_[0] . '?path=' . $_[1] }, 'plainURL' => $Torrus::Renderer::plainURL, 'clearVar' => sub { delete $self->{'options'}{'variables'}{$_[0]}; @@ -208,7 +206,7 @@ sub renderTreeChooser } else { - $self->setCache($cachekey, time(), $t_expires, $filename, $mime_type); + $cache->setCache($cachekey, time(), $t_expires, $filename, $mime_type); @ret = ($outfile, $mime_type, $t_expires - time()); } -- 2.11.4.GIT