Bugzilla – Attachment 10050 Details for
Bug 6679
Fixing code so it passes basic Perl::Critic tests
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 6679: Fixing 26 perlcritic violations in C4/Tags.pm
Bug-6679-Fixing-26-perlcritic-violations-in-C4Tags.patch (text/plain), 6.64 KB, created by
Jared Camins-Esakov
on 2012-06-09 19:38:10 UTC
(
hide
)
Description:
Bug 6679: Fixing 26 perlcritic violations in C4/Tags.pm
Filename:
MIME Type:
Creator:
Jared Camins-Esakov
Created:
2012-06-09 19:38:10 UTC
Size:
6.64 KB
patch
obsolete
>From fcf8b2dbecd58a43a0b68605a9161f0bae5d4755 Mon Sep 17 00:00:00 2001 >From: Mason James <mtj@kohaaloha.com> >Date: Thu, 24 May 2012 07:52:14 +1200 >Subject: [PATCH] Bug 6679: Fixing 26 perlcritic violations in C4/Tags.pm >Content-Type: text/plain; charset="UTF-8" > >Subroutine prototypes used at line XXX, column 1. See page 194 of PBP. >(Severity: 5) > >Note: Rebased on master 06/09/2012 by jcamins >--- > C4/Tags.pm | 53 +++++++++++++++++++++++++++-------------------------- > 1 files changed, 27 insertions(+), 26 deletions(-) > >diff --git a/C4/Tags.pm b/C4/Tags.pm >index 4ca0786..700be18 100644 >--- a/C4/Tags.pm >+++ b/C4/Tags.pm >@@ -25,6 +25,7 @@ use Exporter; > > use C4::Context; > use C4::Debug; >+#use Data::Dumper; > > use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); > use vars qw($ext_dict $select_all @fields); >@@ -67,7 +68,7 @@ INIT { > $select_all = "SELECT " . join(',',@fields) . "\n FROM tags_all\n"; > } > >-sub get_filters (;$) { >+sub get_filters { > my $query = "SELECT * FROM tags_filters "; > my ($sth); > if (@_) { >@@ -83,7 +84,7 @@ sub get_filters (;$) { > # (SELECT count(*) FROM tags_all ) as tags_all, > # (SELECT count(*) FROM tags_index ) as tags_index, > >-sub approval_counts () { >+sub approval_counts { > my $query = "SELECT > (SELECT count(*) FROM tags_approval WHERE approved= 1) as approved_count, > (SELECT count(*) FROM tags_approval WHERE approved=-1) as rejected_count, >@@ -115,7 +116,7 @@ sub get_count_by_tag_status { > return $sth->fetchrow; > } > >-sub remove_tag ($;$) { >+sub remove_tag { > my $tag_id = shift or return undef; > my $user_id = (@_) ? shift : undef; > my $rows = (defined $user_id) ? >@@ -143,25 +144,25 @@ sub remove_tag ($;$) { > delete_tag_row_by_id($tag_id); > } > >-sub delete_tag_index ($$) { >+sub delete_tag_index { > (@_) or return undef; > my $sth = C4::Context->dbh->prepare("DELETE FROM tags_index WHERE term = ? AND biblionumber = ? LIMIT 1"); > $sth->execute(@_); > return $sth->rows || 0; > } >-sub delete_tag_approval ($) { >+sub delete_tag_approval { > (@_) or return undef; > my $sth = C4::Context->dbh->prepare("DELETE FROM tags_approval WHERE term = ? LIMIT 1"); > $sth->execute(shift); > return $sth->rows || 0; > } >-sub delete_tag_row_by_id ($) { >+sub delete_tag_row_by_id { > (@_) or return undef; > my $sth = C4::Context->dbh->prepare("DELETE FROM tags_all WHERE tag_id = ? LIMIT 1"); > $sth->execute(shift); > return $sth->rows || 0; > } >-sub delete_tag_rows_by_ids (@) { >+sub delete_tag_rows_by_ids { > (@_) or return undef; > my $i=0; > foreach(@_) { >@@ -172,7 +173,7 @@ sub delete_tag_rows_by_ids (@) { > return $i; > } > >-sub get_tag_rows ($) { >+sub get_tag_rows { > my $hash = shift || {}; > my @ok_fields = @fields; > push @ok_fields, 'limit'; # push the limit! :) >@@ -213,7 +214,7 @@ sub get_tag_rows ($) { > return $sth->fetchall_arrayref({}); > } > >-sub get_tags (;$) { # i.e., from tags_index >+sub get_tags { # i.e., from tags_index > my $hash = shift || {}; > my @ok_fields = qw(term biblionumber weight limit sort approved); > my $wheres; >@@ -282,7 +283,7 @@ sub get_tags (;$) { # i.e., from tags_index > return $sth->fetchall_arrayref({}); > } > >-sub get_approval_rows (;$) { # i.e., from tags_approval >+sub get_approval_rows { # i.e., from tags_approval > my $hash = shift || {}; > my @ok_fields = qw(term approved date_approved approved_by weight_total limit sort borrowernumber); > my $wheres; >@@ -357,7 +358,7 @@ sub get_approval_rows (;$) { # i.e., from tags_approval > return $sth->fetchall_arrayref({}); > } > >-sub is_approved ($) { >+sub is_approved { > my $term = shift or return undef; > my $sth = C4::Context->dbh->prepare("SELECT approved FROM tags_approval WHERE term = ?"); > $sth->execute($term); >@@ -368,7 +369,7 @@ sub is_approved ($) { > return $sth->fetchrow; > } > >-sub get_tag_index ($;$) { >+sub get_tag_index { > my $term = shift or return undef; > my $sth; > if (@_) { >@@ -432,7 +433,7 @@ sub remove_filter { > return scalar @_; > } > >-sub add_tag_approval ($;$$) { # or disapproval >+sub add_tag_approval { # or disapproval > $debug and warn "add_tag_approval(" . join(", ",map {defined($_) ? $_ : 'UNDEF'} @_) . ")"; > my $term = shift or return undef; > my $query = "SELECT * FROM tags_approval WHERE term = ?"; >@@ -457,7 +458,7 @@ sub add_tag_approval ($;$$) { # or disapproval > return $sth->rows; > } > >-sub mod_tag_approval ($$$) { >+sub mod_tag_approval { > my $operator = shift; > defined $operator or return undef; # have to test defined to allow =0 (kohaadmin) > my $term = shift or return undef; >@@ -468,7 +469,7 @@ sub mod_tag_approval ($$$) { > $sth->execute($operator,$approval,$term); > } > >-sub add_tag_index ($$;$) { >+sub add_tag_index { > my $term = shift or return undef; > my $biblionumber = shift or return undef; > my $query = "SELECT * FROM tags_index WHERE term = ? AND biblionumber = ?"; >@@ -482,14 +483,14 @@ sub add_tag_index ($$;$) { > return $sth->rows; > } > >-sub get_tag ($) { # by tag_id >+sub get_tag { # by tag_id > (@_) or return undef; > my $sth = C4::Context->dbh->prepare("$select_all WHERE tag_id = ?"); > $sth->execute(shift); > return $sth->fetchrow_hashref; > } > >-sub rectify_weights (;$) { >+sub rectify_weights { > my $dbh = C4::Context->dbh; > my $sth; > my $query = " >@@ -516,27 +517,27 @@ sub rectify_weights (;$) { > return ($results,\%tally); > } > >-sub increment_weights ($$) { >+sub increment_weights { > increment_weight(@_); > increment_weight_total(shift); > } >-sub decrement_weights ($$) { >+sub decrement_weights { > decrement_weight(@_); > decrement_weight_total(shift); > } >-sub increment_weight_total ($) { >+sub increment_weight_total { > _set_weight_total('weight_total+1',shift); > } >-sub increment_weight ($$) { >+sub increment_weight { > _set_weight('weight+1',shift,shift); > } >-sub decrement_weight_total ($) { >+sub decrement_weight_total { > _set_weight_total('weight_total-1',shift); > } >-sub decrement_weight ($$) { >+sub decrement_weight { > _set_weight('weight-1',shift,shift); > } >-sub _set_weight_total ($$) { >+sub _set_weight_total { > my $sth = C4::Context->dbh->prepare(" > UPDATE tags_approval > SET weight_total=" . (shift) . " >@@ -544,7 +545,7 @@ sub _set_weight_total ($$) { > "); # note: CANNOT use "?" for weight_total (see the args above). > $sth->execute(shift); # just the term > } >-sub _set_weight ($$$) { >+sub _set_weight { > my $dbh = C4::Context->dbh; > my $sth = $dbh->prepare(" > UPDATE tags_index >@@ -555,7 +556,7 @@ sub _set_weight ($$$) { > $sth->execute(@_); > } > >-sub add_tag ($$;$$) { # biblionumber,term,[borrowernumber,approvernumber] >+sub add_tag { # biblionumber,term,[borrowernumber,approvernumber] > my $biblionumber = shift or return undef; > my $term = shift or return undef; > my $borrowernumber = (@_) ? shift : 0; # the user, default to kohaadmin >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
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