Attachment 63510 Details for Bug 18606 – Bug 18606: Get rid of GetCollection

[patch] Bug 18606: Get rid of GetCollection

Bug-18606-Get-rid-of-GetCollection.patch (text/plain), 4.72 KB, created by Josef Moravec on 2017-05-18 09:21:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Moravec

Created: 2017-05-18 09:21:21 UTC

Size: 4.72 KB

patch

obsolete

>From 4bbe74d70cd718612872c7fa79cbe0e9f18b7c56 Mon Sep 17 00:00:00 2001
>From: Josef Moravec <josef.moravec@gmail.com>
>Date: Fri, 14 Oct 2016 17:40:41 +0200
>Subject: [PATCH] Bug 18606: Get rid of GetCollection
>
>---
> C4/RotatingCollections.pm                  | 32 ------------------------------
> rotating_collections/addItems.pl           | 15 ++++++++------
> rotating_collections/editCollections.pl    |  8 ++++----
> rotating_collections/transferCollection.pl | 14 +++++++------
> 4 files changed, 21 insertions(+), 48 deletions(-)
>
>diff --git a/C4/RotatingCollections.pm b/C4/RotatingCollections.pm
>index c142d34..484c044 100644
>--- a/C4/RotatingCollections.pm
>+++ b/C4/RotatingCollections.pm
>@@ -53,7 +53,6 @@ BEGIN {
> 
>       GetItemsInCollection
> 
>-      GetCollection
>       GetCollections
> 
>       AddItemToCollection
>@@ -240,37 +239,6 @@ sub GetItemsInCollection {
>     return \@results;
> }
> 
>-=head2 GetCollection
>-
>- ( $colId, $colTitle, $colDesc, $colBranchcode ) = GetCollection( $colId );
>-
>-Returns information about a collection
>-
>- Input:
>-   $colId: Id of the collection
>- Output:
>-   $colId, $colTitle, $colDesc, $colBranchcode
>-
>-=cut
>-
>-sub GetCollection {
>-    my ($colId) = @_;
>-
>-    my $dbh = C4::Context->dbh;
>-
>-    my ( $sth, @results );
>-    $sth = $dbh->prepare("SELECT * FROM collections WHERE colId = ?");
>-    $sth->execute($colId) or return 0;
>-
>-    my $row = $sth->fetchrow_hashref;
>-
>-    return (
>-        $$row{'colId'},   $$row{'colTitle'},
>-        $$row{'colDesc'}, $$row{'colBranchcode'}
>-    );
>-
>-}
>-
> =head2 AddItemToCollection
> 
>  ( $success, $errorcode, $errormessage ) = AddItemToCollection( $colId, $itemnumber );
>diff --git a/rotating_collections/addItems.pl b/rotating_collections/addItems.pl
>index cd24d50..1a3f358 100755
>--- a/rotating_collections/addItems.pl
>+++ b/rotating_collections/addItems.pl
>@@ -24,6 +24,8 @@ use C4::Context;
> use C4::RotatingCollections;
> use C4::Items;
> 
>+use Koha::RotatingCollections;
>+
> use CGI qw ( -utf8 );
> 
> my $query = new CGI;
>@@ -87,18 +89,19 @@ if ( $query->param('action') eq 'addItem' ) {
>     }
> }
> 
>-my ( $colId, $colTitle, $colDescription, $colBranchcode ) =
>-  GetCollection( $query->param('colId') );
>+my $colId = $query->param('colId');
>+my $collection = Koha::RotatingCollections->find($colId);
>+
> my $collectionItems = GetItemsInCollection($colId);
> if ($collectionItems) {
>     $template->param( collectionItemsLoop => $collectionItems );
> }
> 
> $template->param(
>-    colId          => $colId,
>-    colTitle       => $colTitle,
>-    colDescription => $colDescription,
>-    colBranchcode  => $colBranchcode,
>+    colId          => $collection->colId,
>+    colTitle       => $collection->colTitle,
>+    colDescription => $collection->colDesc,
>+    colBranchcode  => $collection->colBranchcode,
> );
> 
> output_html_with_http_headers $query, $cookie, $template->output;
>diff --git a/rotating_collections/editCollections.pl b/rotating_collections/editCollections.pl
>index 3b0e854..bd4b917 100755
>--- a/rotating_collections/editCollections.pl
>+++ b/rotating_collections/editCollections.pl
>@@ -77,13 +77,13 @@ if ( $action eq 'create' ) {
> 
> ## Edit a club or service: grab data, put in form.
> elsif ( $action eq 'edit' ) {
>-    my ( $colId, $colTitle, $colDesc, $colBranchcode ) = GetCollection( $query->param('colId') );
>+    my $collection = Koha::RotatingCollections->find($query->param('colId'));
> 
>     $template->param(
>         previousActionEdit => 1,
>-        editColId          => $colId,
>-        editColTitle       => $colTitle,
>-        editColDescription => $colDesc,
>+        editColId          => $collection->{colId},
>+        editColTitle       => $collection->{colTitle},
>+        editColDescription => $collection->{colDesc},
>     );
> }
> 
>diff --git a/rotating_collections/transferCollection.pl b/rotating_collections/transferCollection.pl
>index 49b09b3..8c48ed9 100755
>--- a/rotating_collections/transferCollection.pl
>+++ b/rotating_collections/transferCollection.pl
>@@ -23,6 +23,8 @@ use C4::Auth;
> use C4::Context;
> use C4::RotatingCollections;
> 
>+use Koha::RotatingCollections;
>+
> use CGI qw ( -utf8 );
> 
> my $query = new CGI;
>@@ -60,13 +62,13 @@ if ($toBranch) {
> }
> 
> ## Get data about collection
>-my ( $colTitle, $colDesc, $colBranchcode );
>-( $colId, $colTitle, $colDesc, $colBranchcode ) = GetCollection($colId);
>+my $collection = Koha::RotatingCollections->find($colId);
>+
> $template->param(
>-    colId            => $colId,
>-    colTitle         => $colTitle,
>-    colDesc          => $colDesc,
>-    colBranchcode    => $colBranchcode,
>+    colId            => $collection->colId,
>+    colTitle         => $collection->colTitle,
>+    colDesc          => $collection->colDesc,
>+    colBranchcode    => $collection->colBranchcode,
> );
> 
> output_html_with_http_headers $query, $cookie, $template->output;
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 18606: 63508 | 63509 | 63510 | 63511 | 63512 | 63513 | 63514 | 63515 | 63516 | 63517 | 63518 | 63519 | 63520 | 63521 | 63522 | 63523 | 63524 | 63525 | 63526 | 63527 | 63528 | 66227 | 66228 | 66229 | 66230 | 66231 | 66232 | 66233 | 66234 | 66235 | 66236 | 66237 | 66238 | 66239 | 66240 | 66241 | 66286 | 66287 | 66288 | 66289 | 66290 | 66291 | 66292 | 66293 | 66294 | 66295 | 66296 | 66297 | 66298 | 66299 | 66300 | 67734 | 67735 | 67736 | 67737 | 67738 | 67739 | 67740 | 67741 | 67742 | 67743 | 67744 | 67745 | 67746 | 67747 | 67748 | 67749 | 68428 | 68429 | 68430 | 68431 | 68432 | 68433 | 68434 | 68435 | 68436 | 68437 | 68438 | 68439 | 68440 | 68441 | 68442 | 68443 | 69709 | 69710 | 69711 | 69712 | 69713 | 69714 | 69715 | 69716 | 69717 | 69718 | 69719 | 69720 | 69721 | 69722 | 69723 | 69759 | 72416 | 72417 | 72418 | 72419 | 72420 | 72421 | 72422 | 72423 | 72424 | 72425 | 72426 | 72427 | 72428 | 72429 | 72430 | 72431 | 72572 | 72573 | 72574 | 72575 | 72576 | 72577 | 72578 | 72579 | 72580 | 72581 | 72582 | 72583 | 72584 | 72585 | 72586 | 72587 | 72816 | 79141 | 79142 | 79143 | 79144 | 79145 | 79146 | 79147 | 79148 | 79149 | 79150 | 79151 | 79152 | 79153 | 79154 | 79155 | 79156 | 79157 | 79158 | 79161