Attachment 9746 Details for Bug 6679 – Fixing 26 perlcritic violations in C4/Tags.pm

[patch] Fixing 26 perlcritic violations in C4/Tags.pm

Fixing-26-perlcritic-violations-in-C4Tagspm.patch (text/plain), 7.02 KB, created by Mason James on 2012-05-23 20:24:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mason James

Created: 2012-05-23 20:24:39 UTC

Size: 7.02 KB

patch

obsolete

>From 9772470bc5befeadbf8ccc5d794fa8c9e3a723b8 Mon Sep 17 00:00:00 2001
>From: Mason James <mtj@kohaaloha.com>
>Date: Thu, 24 May 2012 07:52:14 +1200
>Subject: [PATCH] Fixing 26 perlcritic violations in C4/Tags.pm
>Content-Type: text/plain; charset="utf-8"
>http://koha-community.org
>
>Subroutine prototypes used at line XXX, column 1.  See page 194 of PBP.  (Severity: 5)
>
>http://bugs.koha-community.org/show_bug.cgi?id=6679
>---
> C4/Tags.pm        |   53 +++++++++++++++++++++++++++--------------------------
> opac/opac-tags.pl |    2 ++
> 2 files changed, 29 insertions(+), 26 deletions(-)
>
>diff --git a/C4/Tags.pm b/C4/Tags.pm
>index 06c1e1d..27b203a 100644
>--- a/C4/Tags.pm
>+++ b/C4/Tags.pm
>@@ -21,6 +21,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);
>@@ -63,7 +64,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 (@_) {
>@@ -79,7 +80,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,
>@@ -111,7 +112,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) ?
>@@ -139,25 +140,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(@_) {
>@@ -168,7 +169,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! :)
>@@ -209,7 +210,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;
>@@ -278,7 +279,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;
>@@ -353,7 +354,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);
>@@ -364,7 +365,7 @@ sub is_approved ($) {
> 	return $sth->fetchrow;
> }
> 
>-sub get_tag_index ($;$) {
>+sub get_tag_index {
> 	my $term = shift or return undef;
> 	my $sth;
> 	if (@_) {
>@@ -428,7 +429,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 = ?";
>@@ -453,7 +454,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;
>@@ -464,7 +465,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 = ?";
>@@ -478,14 +479,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 = "
>@@ -512,27 +513,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) . "
>@@ -540,7 +541,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
>@@ -551,7 +552,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
>diff --git a/opac/opac-tags.pl b/opac/opac-tags.pl
>index 36bc096..173a25c 100755
>--- a/opac/opac-tags.pl
>+++ b/opac/opac-tags.pl
>@@ -43,6 +43,8 @@ use C4::Scrubber;
> use C4::Biblio;
> use C4::Tags qw(add_tag get_approval_rows get_tag_rows remove_tag);
> 
>+use Data::Dumper;
>+
> my %newtags = ();
> my @deltags = ();
> my %counts  = ();
>-- 
>1.7.2.5

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