Attachment 10949 Details for Bug 6679 – Bug 6679 - [SIGNED-OFF] fix 6 perlcritic violations in C4/Reports/Guided.pm

[patch] Bug 6679 - [SIGNED-OFF] fix 6 perlcritic violations in C4/Reports/Guided.pm

0001-Bug-6679-SIGNED-OFF-fix-6-perlcritic-violations-in-C.patch (text/plain), 2.42 KB, created by Jonathan Druart on 2012-07-18 13:53:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2012-07-18 13:53:44 UTC

Size: 2.42 KB

patch

obsolete

>From eda026d0f6b40e21545b2ff5228f5b62cc1a467e Mon Sep 17 00:00:00 2001
>From: Mason James <mtj@kohaaloha.com>
>Date: Wed, 27 Jun 2012 01:50:33 +1200
>Subject: [PATCH 1/1] Bug 6679 - [SIGNED-OFF] fix 6 perlcritic violations in
> C4/Reports/Guided.pm
>
>- Subroutine prototypes used at line 376, column 1.  See page 194 of PBP.  (Severity: 5)
>
>- Bareword file handle opened at line 757, column 2.  See pages 202,204 of PBP.  (Severity: 5)
>
>- Two-argument "open" used at line 757, column 2.  See page 207 of PBP.  (Severity: 5)
>
>Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
>---
> C4/Reports/Guided.pm |   15 ++++++++-------
> 1 files changed, 8 insertions(+), 7 deletions(-)
>
>diff --git a/C4/Reports/Guided.pm b/C4/Reports/Guided.pm
>index fbc25d8..d691177 100644
>--- a/C4/Reports/Guided.pm
>+++ b/C4/Reports/Guided.pm
>@@ -373,7 +373,7 @@ sub get_criteria {
>     return ( \@criteria_array );
> }
> 
>-sub nb_rows($) {
>+sub nb_rows {
>     my $sql = shift or return;
>     my $sth = C4::Context->dbh->prepare($sql);
>     $sth->execute();
>@@ -407,20 +407,20 @@ the user in a user-supplied SQL query WILL apply in any case.
> #  ~ remove any LIMIT clause
> #  ~ repace SELECT clause w/ SELECT count(*)
> 
>-sub select_2_select_count ($) {
>+sub select_2_select_count {
>     # Modify the query passed in to create a count query... (I think this covers all cases -crn)
>     my ($sql) = strip_limit(shift) or return;
>     $sql =~ s/\bSELECT\W+(?:\w+\W+){1,}?FROM\b|\bSELECT\W\*\WFROM\b/SELECT count(*) FROM /ig;
>     return $sql;
> }
>-sub strip_limit ($) {
>+sub strip_limit {
>     my $sql = shift or return;
>     ($sql =~ /\bLIMIT\b/i) or return ($sql, 0, undef);
>     $sql =~ s/\bLIMIT\b\s*(\d+)(\s*\,\s*(\d+))?\s*/ /ig;
>     return ($sql, (defined $2 ? $1 : 0), (defined $3 ? $3 : $1));   # offset can default to 0, LIMIT cannot!
> }
> 
>-sub execute_query ($;$$$) {
>+sub execute_query {
> 
>     my ( $sql, $offset, $limit, $no_count ) = @_;
> 
>@@ -772,14 +772,15 @@ sub _get_column_defs {
> 	my ($theme, $lang) = C4::Templates::themelanguage($htdocs, $columns_def_file, $section,$cgi);
> 
> 	my $full_path_to_columns_def_file="$htdocs/$theme/$lang/$columns_def_file";    
>-	open (COLUMNS,$full_path_to_columns_def_file);
>-	while (my $input = <COLUMNS>){
>+
>+	open (my $fh , '<' ,$full_path_to_columns_def_file);
>+	while (my $input = <$fh>){
> 		chomp $input;
> 		my @row =split(/\t/,$input);
> 		$columns{$row[0]}= $row[1];
> 	}
> 
>-	close COLUMNS;
>+	close $fh;
> 	return \%columns;
> }
> 1;
>-- 
>1.7.7.3
>

Actions: View | Diff | Splinter Review

Attachments on bug 6679: 4883 | 4884 | 4885 | 4886 | 4887 | 4888 | 5445 | 5446 | 5483 | 5487 | 6121 | 6122 | 6123 | 6139 | 6140 | 6141 | 6142 | 6143 | 6144 | 6270 | 6271 | 6663 | 6670 | 6675 | 6676 | 6677 | 6678 | 8542 | 8897 | 8898 | 8899 | 8950 | 8951 | 9746 | 9747 | 9748 | 9749 | 9750 | 10050 | 10051 | 10052 | 10053 | 10054 | 10075 | 10076 | 10077 | 10078 | 10079 | 10484 | 10485 | 10486 | 10487 | 10488 | 10489 | 10491 | 10492 | 10493 | 10494 | 10495 | 10496 | 10497 | 10499 | 10500 | 10501 | 10502 | 10503 | 10504 | 10505 | 10506 | 10507 | 10508 | 10509 | 10510 | 10512 | 10513 | 10514 | 10515 | 10517 | 10521 | 10522 | 10523 | 10524 | 10525 | 10526 | 10527 | 10935 | 10936 | 10938 | 10940 | 10944 | 10945 | 10946 | 10947 | 10948 | 10949 | 10950 | 10952 | 10953 | 10955 | 10957 | 10958 | 10959 | 10960 | 10961 | 10962 | 10963 | 10964 | 10965 | 10966 | 10967 | 10972 | 10976 | 10979 | 10980 | 10981 | 12224 | 12363 | 12490 | 12491 | 12492 | 34191 | 34192 | 34193 | 34194 | 34195 | 34196 | 34197 | 39100 | 39101 | 39102 | 39392 | 39393 | 39394 | 39395 | 39396 | 39397 | 39398 | 42770 | 47086 | 47087 | 47088 | 47089 | 47090 | 47178 | 47179 | 47180 | 47181 | 47205 | 47206 | 47207 | 47208