#use warnings; FIXME - Bug 2505
require Exporter;
use C4::Context;
-use C4::Koha;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
BEGIN {
# set the version for version checking
- $VERSION = 3.02;
+ $VERSION = 3.07.00.049;
@ISA = qw(Exporter);
@EXPORT = qw(
&GetBranchCategory
&DelBranchCategory
&CheckCategoryUnique
&mybranch
+ &GetBranchesCount
);
- @EXPORT_OK = qw( &onlymine &mybranch get_branch_code_from_name );
+ @EXPORT_OK = qw( &onlymine &mybranch );
}
=head1 NAME
$branches = &GetBranches();
-Returns informations about ALL branches, IndependantBranches Insensitive.
+Returns informations about ALL branches, IndependentBranches Insensitive.
GetBranchInfo() returns the same information without the problems of this function
(namespace collision, mainly).
sub onlymine {
return
- C4::Context->preference('IndependantBranches') &&
+ C4::Context->preference('IndependentBranches') &&
C4::Context->userenv &&
C4::Context->userenv->{flags} %2 != 1 &&
C4::Context->userenv->{branch} ;
return C4::Context->userenv->{branch} || '';
}
-sub GetBranchesLoop (;$$) { # since this is what most pages want anyway
+sub GetBranchesLoop { # since this is what most pages want anyway
my $branch = @_ ? shift : mybranch(); # optional first argument is branchcode of "my branch", if preselection is wanted.
my $onlymine = @_ ? shift : onlymine();
my $branches = GetBranches($onlymine);
my @loop;
- foreach ( sort { uc($branches->{$a}->{branchname}) cmp uc($branches->{$b}->{branchname}) } keys %$branches ) {
+ foreach my $branchcode ( sort { uc($branches->{$a}->{branchname}) cmp uc($branches->{$b}->{branchname}) } keys %$branches ) {
push @loop, {
- value => $_,
- selected => ($_ eq $branch) ? 1 : 0,
- branchname => $branches->{$_}->{branchname},
+ value => $branchcode,
+ branchcode => $branchcode,
+ selected => ($branchcode eq $branch) ? 1 : 0,
+ branchname => $branches->{$branchcode}->{branchname},
};
}
return \@loop;
(branchcode,branchname,branchaddress1,
branchaddress2,branchaddress3,branchzip,branchcity,branchstate,
branchcountry,branchphone,branchfax,branchemail,
- branchurl,branchip,branchprinter,branchnotes)
- VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+ branchurl,branchip,branchprinter,branchnotes,opac_info)
+ VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
";
my $sth = $dbh->prepare($query);
$sth->execute(
$data->{'branchphone'}, $data->{'branchfax'},
$data->{'branchemail'}, $data->{'branchurl'},
$data->{'branchip'}, $data->{'branchprinter'},
- $data->{'branchnotes'},
+ $data->{'branchnotes'}, $data->{opac_info},
);
return 1 if $dbh->err;
} else {
branchaddress2=?,branchaddress3=?,branchzip=?,
branchcity=?,branchstate=?,branchcountry=?,branchphone=?,
branchfax=?,branchemail=?,branchurl=?,branchip=?,
- branchprinter=?,branchnotes=?
+ branchprinter=?,branchnotes=?,opac_info=?
WHERE branchcode=?
";
my $sth = $dbh->prepare($query);
$data->{'branchphone'}, $data->{'branchfax'},
$data->{'branchemail'}, $data->{'branchurl'},
$data->{'branchip'}, $data->{'branchprinter'},
- $data->{'branchnotes'},
+ $data->{'branchnotes'}, $data->{opac_info},
$data->{'branchcode'},
);
}
=head2 GetBranchCategories
- my $categories = GetBranchCategories($branchcode,$categorytype);
+ my $categories = GetBranchCategories($branchcode,$categorytype,$show_in_pulldown,$selected_in_pulldown);
Returns a list ref of anon hashrefs with keys eq columns of branchcategories table,
i.e. categorycode, categorydescription, categorytype, categoryname.
=cut
sub GetBranchCategories {
- my ($branchcode,$categorytype) = @_;
- my $dbh = C4::Context->dbh();
- my $query = "SELECT c.* FROM branchcategories c";
- my (@where, @bind);
- if($branchcode) {
- $query .= ",branchrelations r, branches b ";
- push @where, "c.categorycode=r.categorycode and r.branchcode=? ";
- push @bind , $branchcode;
- }
- if ($categorytype) {
- push @where, " c.categorytype=? ";
- push @bind, $categorytype;
- }
- $query .= " where " . join(" and ", @where) if(@where);
- $query .= " order by categorytype,c.categorycode";
- my $sth=$dbh->prepare( $query);
- $sth->execute(@bind);
-
- my $branchcats = $sth->fetchall_arrayref({});
- $sth->finish();
- return( $branchcats );
+ my ( $branchcode, $categorytype, $show_in_pulldown, $selected_in_pulldown ) = @_;
+ my $dbh = C4::Context->dbh();
+
+ my $query = "SELECT c.* FROM branchcategories c";
+ my ( @where, @bind );
+
+ if( $branchcode ) {
+ $query .= ",branchrelations r, branches b ";
+ push @where, "c.categorycode = r.categorycode AND r.branchcode = ? ";
+ push @bind , $branchcode;
+ }
+
+ if ( $categorytype ) {
+ push @where, " c.categorytype = ? ";
+ push @bind, $categorytype;
+ }
+
+ if ( defined( $show_in_pulldown ) ) {
+ push( @where, " c.show_in_pulldown = ? " );
+ push( @bind, $show_in_pulldown );
+ }
+
+ $query .= " WHERE " . join(" AND ", @where) if(@where);
+ $query .= " ORDER BY categorytype,c.categorycode";
+ my $sth=$dbh->prepare( $query);
+ $sth->execute(@bind);
+
+ my $branchcats = $sth->fetchall_arrayref({});
+ $sth->finish();
+
+ if ( $selected_in_pulldown ) {
+ foreach my $bc ( @$branchcats ) {
+ $bc->{'selected'} = 1 if ( $bc->{'categorycode'} eq $selected_in_pulldown );
+ }
+ }
+
+ return( $branchcats );
}
=head2 GetCategoryTypes
=cut
#TODO manage category types. rename possibly to 'agency domains' ? as borrowergroups are called categories.
-sub GetCategoryTypes() {
+sub GetCategoryTypes {
return ( 'searchdomain','properties');
}
=cut
-sub GetBranch ($$) {
+sub GetBranch {
my ( $query, $branches ) = @_; # get branch for this query from branches
my $branch = $query->param('branch');
my %cookie = $query->cookie('userenv');
return $sth->fetchrow_hashref();
}
-=head2 get_branchinfos_of
-
- my $branchinfos_of = get_branchinfos_of(@branchcodes);
-
-Associates a list of branchcodes to the information of the branch, taken in
-branches table.
-
-Returns a href where keys are branchcodes and values are href where keys are
-branch information key.
-
- print 'branchname is ', $branchinfos_of->{$code}->{branchname};
-
-=cut
-
-sub get_branchinfos_of {
- my @branchcodes = @_;
-
- my $query = '
- SELECT branchcode,
- branchname
- FROM branches
- WHERE branchcode IN ('
- . join( ',', map( { "'" . $_ . "'" } @branchcodes ) ) . ')
-';
- return C4::Koha::get_infos_of( $query, 'branchcode' );
-}
-
-
=head2 GetBranchesInCategory
my $branches = GetBranchesInCategory($categorycode);
=cut
-sub GetBranchesInCategory($) {
+sub GetBranchesInCategory {
my ($categorycode) = @_;
my @branches;
my $dbh = C4::Context->dbh();
my $dbh = C4::Context->dbh;
if ($data->{'add'}){
# we are doing an insert
- my $sth = $dbh->prepare("INSERT INTO branchcategories (categorycode,categoryname,codedescription,categorytype) VALUES (?,?,?,?)");
- $sth->execute(uc( $data->{'categorycode'} ),$data->{'categoryname'}, $data->{'codedescription'},$data->{'categorytype'} );
+ my $sth = $dbh->prepare("INSERT INTO branchcategories (categorycode,categoryname,codedescription,categorytype,show_in_pulldown) VALUES (?,?,?,?,?)");
+ $sth->execute(uc( $data->{'categorycode'} ),$data->{'categoryname'}, $data->{'codedescription'},$data->{'categorytype'},$data->{'show_in_pulldown'} );
$sth->finish();
}
else {
# modifying
- my $sth = $dbh->prepare("UPDATE branchcategories SET categoryname=?,codedescription=?,categorytype=? WHERE categorycode=?");
- $sth->execute($data->{'categoryname'}, $data->{'codedescription'},$data->{'categorytype'},uc( $data->{'categorycode'} ) );
+ my $sth = $dbh->prepare("UPDATE branchcategories SET categoryname=?,codedescription=?,categorytype=?,show_in_pulldown=? WHERE categorycode=?");
+ $sth->execute($data->{'categoryname'}, $data->{'codedescription'},$data->{'categorytype'},$data->{'show_in_pulldown'},uc( $data->{'categorycode'} ) );
$sth->finish();
}
}
return $total;
}
-sub get_branch_code_from_name {
- my @branch_name = @_;
- my $query = "SELECT branchcode FROM branches WHERE branchname=?;";
- my $dbh = C4::Context->dbh();
- my $sth = $dbh->prepare($query);
- $sth->execute(@branch_name);
- return $sth->fetchrow_array;
+sub GetBranchesCount {
+ my $dbh = C4::Context->dbh();
+ my $query = "SELECT COUNT(*) AS branches_count FROM branches";
+ my $sth = $dbh->prepare( $query );
+ $sth->execute();
+ my $row = $sth->fetchrow_hashref();
+ return $row->{'branches_count'};
}
1;