From 56a2704e545cda2ae911d2cf7610e29244b9f986 Mon Sep 17 00:00:00 2001 From: atz Date: Mon, 23 Aug 2010 17:56:31 +0000 Subject: [PATCH] Perltidy death to tabs git-svn-id: svn://svn.open-ils.org/ILS/trunk@17312 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/perlmods/OpenILS/WWW/Web.pm | 120 ++++++++++++----------- 1 file changed, 62 insertions(+), 58 deletions(-) diff --git a/Open-ILS/src/perlmods/OpenILS/WWW/Web.pm b/Open-ILS/src/perlmods/OpenILS/WWW/Web.pm index f10946d0d2..9215064a66 100644 --- a/Open-ILS/src/perlmods/OpenILS/WWW/Web.pm +++ b/Open-ILS/src/perlmods/OpenILS/WWW/Web.pm @@ -1,11 +1,12 @@ package OpenILS::WWW::Web; -use strict; use warnings; +use strict; +use warnings; use Apache2::Log; use Apache2::Const -compile => qw(OK REDIRECT :log); -use APR::Const -compile => qw(:error SUCCESS); +use APR::Const -compile => qw(:error SUCCESS); use Apache2::RequestRec (); -use Apache2::RequestIO (); +use Apache2::RequestIO (); use Apache2::RequestUtil; #use CGI (); @@ -14,81 +15,84 @@ use Template; use OpenSRF::EX qw(:try); use OpenSRF::System; -my $main_ttk = "opac/logic/page_router.ttk"; -my $error_ttk = "opac/pages/error.ttk"; -my $init_ttk = "opac/logic/page_init.ttk"; -my $bootstrap = "SYSCONFDIR/opensrf_core.xml"; +my $main_ttk = "opac/logic/page_router.ttk"; +my $error_ttk = "opac/pages/error.ttk"; +my $init_ttk = "opac/logic/page_init.ttk"; +my $bootstrap = "SYSCONFDIR/opensrf_core.xml"; my $child_init_ttk = "opac/logic/child_init.ttk"; -my $includes = []; # [ '/pines/cvs/ILS/Open-ILS/src/templates' ]; +my $includes = []; # [ '/pines/cvs/ILS/Open-ILS/src/templates' ]; sub import { - my( $self, $tdir ) = @_; - $includes = [ $tdir ]; + my ( $self, $tdir ) = @_; + $includes = [$tdir]; } - - my $plugin_base = 'OpenILS::Template::Plugin'; sub handler { - my $apache = shift; - print "Content-type: text/html; charset=utf-8\n\n"; + my $apache = shift; + print "Content-type: text/html; charset=utf-8\n\n"; - _process_template( - apache => $apache, - template => $main_ttk, - pre_process => $init_ttk ); + _process_template( + apache => $apache, + template => $main_ttk, + pre_process => $init_ttk + ); - return Apache2::Const::OK; + return Apache2::Const::OK; } sub child_init_handler { - _process_template( template => $child_init_ttk ); + _process_template( template => $child_init_ttk ); } sub _process_template { - my %params = @_; - my $ttk = $params{template} || return undef; - my $apache = $params{apache} || undef; - my $pre_process = $params{pre_process} || undef; - my $param_hash = $params{params} || {}; - - my $template; - - $template = Template->new( { - OUTPUT => $apache, - ABSOLUTE => 1, - RELATIVE => 1, - PLUGIN_BASE => $plugin_base, - PRE_PROCESS => $pre_process, - INCLUDE_PATH => $includes, - PRE_CHOMP => 1, - POST_CHOMP => 1, - } - ); - - try { - - if( ! $template->process( $ttk, $param_hash ) ) { - warn "Error Occured: " . $template->error(); - my $err = $template->error(); - $err =~ s/\n/\/g; - warn "Error processing template $ttk\n"; - my $string = "
Unable to process template:

" . $err . "!!!
"; - $template->process( $error_ttk , { error => $string } ); - } - - } catch Error with { - my $e = shift; - warn "Error processing template $ttk: $e - $@ \n"; - print "


Error

$e

$@

"; - return; - }; + my %params = @_; + my $ttk = $params{template} || return undef; + my $apache = $params{apache} || undef; + my $pre_process = $params{pre_process} || undef; + my $param_hash = $params{params} || {}; + + my $template; + + $template = Template->new( + { + OUTPUT => $apache, + ABSOLUTE => 1, + RELATIVE => 1, + PLUGIN_BASE => $plugin_base, + PRE_PROCESS => $pre_process, + INCLUDE_PATH => $includes, + PRE_CHOMP => 1, + POST_CHOMP => 1, + } + ); + + try { + + if ( !$template->process( $ttk, $param_hash ) ) { + warn "Error Occured: " . $template->error(); + my $err = $template->error(); + $err =~ s/\n/\/g; + warn "Error processing template $ttk\n"; + my $string = + "
Unable to process template:

" + . $err + . "!!!
"; + $template->process( $error_ttk, { error => $string } ); + } + + } + catch Error with { + my $e = shift; + warn "Error processing template $ttk: $e - $@ \n"; + print "


Error

$e

$@

"; + return; + }; } - 1; -- 2.43.2