From 00ad2d7e6978c776e87a3ddbf204d783cffd4bf1 Mon Sep 17 00:00:00 2001 From: Andrew Moore Date: Tue, 29 Jul 2008 11:42:47 -0500 Subject: [PATCH] Bug 1953 [3/6]: refactoring to remove superfluous where clause. refactored the SQL query to remove a confusing and superfluous 'WHERE 1' clause. Signed-off-by: Galen Charlton Signed-off-by: Joshua Ferraro --- C4/Koha.pm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/C4/Koha.pm b/C4/Koha.pm index 5a7fe4dbea..b5f6f911bc 100644 --- a/C4/Koha.pm +++ b/C4/Koha.pm @@ -891,17 +891,22 @@ sub displayServers { my ( $position, $type ) = @_; my $dbh = C4::Context->dbh; - my $strsth = "SELECT * FROM z3950servers where 1"; + my $strsth = 'SELECT * FROM z3950servers'; + my @where_clauses; my @bind_params; if ( $position ) { push @bind_params, $position; - $strsth .= ' AND position = ? '; + push @where_clauses, ' position = ? '; } if ( $type ) { push @bind_params, $type; - $strsth .= ' AND type = ? '; + push @where_clauses, ' type = ? '; + } + + if ( @where_clauses ) { + $strsth .= ' WHERE ' . join( ' AND ', @where_clauses ); } my $rq = $dbh->prepare($strsth); -- 2.39.5