Jonathan Druart
8f436a5075
C4::Koha::getframeworks returned a hashref of biblio frameworks. It was mainly used to generate the dropdown list of frameworks. The scripts modified in this patch did not necessary order the element by description (frameworktext), the displays were not consistent from one screen to another. Using the same search method everywhere: Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] }); We will know always get the framework in the same order. Test plan: Following the different pages modified by this patch, and make sure the frameworks are displayed correctly in the dropdown list: 1/ acqui/z3950_search.pl - Create an order from an external source. 2/ admin/fieldmapping.pl - Define some mappings keyword / MARC field 3/ admin/marctagstructure.pl - On the MARC frameworks admin page, select another framework than the default one and click on the 'Search' button 4/ catalogue/MARCdetail.pl - On the MARC defail page, change the framework you want to use to display the record 5/ cataloguing/addbiblio.pl - Add or edit a biblio record, change its framework. When editing, the framework of the record should be selected by default 6/ cataloguing/addbooks.pl - Go on the cataloguing home page and click on the "New record" button. You should see all the frameworks 7/ cataloguing/merge.pl - Select 2 biblio records to merge. On the first step (select the merge reference), you should be allowed to select the framework to use. 8/ tools/inventory.pl - On the inventory page, the "Item statuses" part should be populated as before this patch 9/ tools/manage-marc-import.pl - Stage records for import. Before importing them into the catalog, you should see the framework dropdown list. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Works Ok. No errors Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
145 lines
4.5 KiB
Perl
Executable file
145 lines
4.5 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
|
|
# Copyright 2000-2002 Katipo Communications
|
|
#
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
=head1 cataloguing:addbooks.pl
|
|
|
|
TODO
|
|
|
|
=cut
|
|
|
|
use strict;
|
|
use warnings;
|
|
use CGI qw ( -utf8 );
|
|
use C4::Auth;
|
|
use C4::Biblio;
|
|
use C4::Breeding;
|
|
use C4::Output;
|
|
use C4::Koha;
|
|
use C4::Search;
|
|
|
|
use Koha::BiblioFrameworks;
|
|
use Koha::SearchEngine::Search;
|
|
use Koha::SearchEngine::QueryBuilder;
|
|
|
|
my $input = new CGI;
|
|
|
|
my $success = $input->param('biblioitem');
|
|
my $query = $input->param('q');
|
|
my @value = $input->multi_param('value');
|
|
my $page = $input->param('page') || 1;
|
|
my $results_per_page = 20;
|
|
|
|
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "cataloguing/addbooks.tt",
|
|
query => $input,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { editcatalogue => '*' },
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
# Searching the catalog.
|
|
if ($query) {
|
|
|
|
# build query
|
|
my @operands = $query;
|
|
|
|
my $QParser;
|
|
$QParser = C4::Context->queryparser if (C4::Context->preference('UseQueryParser'));
|
|
my $builtquery;
|
|
my $builder = Koha::SearchEngine::QueryBuilder->new(
|
|
{ index => $Koha::SearchEngine::BIBLIOS_INDEX } );
|
|
my $searcher = Koha::SearchEngine::Search->new(
|
|
{ index => $Koha::SearchEngine::BIBLIOS_INDEX } );
|
|
if ($QParser) {
|
|
$builtquery = $query;
|
|
} else {
|
|
( undef,$builtquery,undef,undef,undef,undef,undef,undef,undef,undef) = $builder->build_query_compat(undef,\@operands);
|
|
}
|
|
# find results
|
|
my ( $error, $marcresults, $total_hits ) = $searcher->simple_search_compat($builtquery, $results_per_page * ($page - 1), $results_per_page);
|
|
|
|
if ( defined $error ) {
|
|
$template->param( error => $error );
|
|
warn "error: " . $error;
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
exit;
|
|
}
|
|
|
|
# format output
|
|
# SimpleSearch() give the results per page we want, so 0 offet here
|
|
my $total = @{$marcresults};
|
|
my @newresults = searchResults( 'intranet', $query, $total, $results_per_page, 0, 0, $marcresults );
|
|
$template->param(
|
|
total => $total_hits,
|
|
query => $query,
|
|
resultsloop => \@newresults,
|
|
pagination_bar => pagination_bar( "/cgi-bin/koha/cataloguing/addbooks.pl?q=$query&", getnbpages( $total_hits, $results_per_page ), $page, 'page' ),
|
|
);
|
|
}
|
|
|
|
# fill with books in breeding farm
|
|
|
|
my $countbr = 0;
|
|
my @resultsbr;
|
|
if ($query) {
|
|
# fill isbn or title, depending on what has been entered
|
|
#u must do check on isbn because u can find number in beginning of title
|
|
#check is on isbn legnth 13 for new isbn and 10 for old isbn
|
|
my ( $title, $isbn );
|
|
if ($query=~/\d/) {
|
|
my $clean_query = $query;
|
|
$clean_query =~ s/-//g; # remove hyphens
|
|
my $querylength = length $clean_query;
|
|
if ( $querylength == 13 || $querylength == 10 ) {
|
|
$isbn = $query;
|
|
}
|
|
}
|
|
if (!$isbn) {
|
|
$title = $query;
|
|
}
|
|
( $countbr, @resultsbr ) = BreedingSearch( $title, $isbn );
|
|
}
|
|
my $breeding_loop = [];
|
|
for my $resultsbr (@resultsbr) {
|
|
push @{$breeding_loop}, {
|
|
id => $resultsbr->{import_record_id},
|
|
isbn => $resultsbr->{isbn},
|
|
copyrightdate => $resultsbr->{copyrightdate},
|
|
editionstatement => $resultsbr->{editionstatement},
|
|
file => $resultsbr->{file_name},
|
|
title => $resultsbr->{title},
|
|
author => $resultsbr->{author},
|
|
};
|
|
}
|
|
|
|
my $frameworks = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] });
|
|
$template->param(
|
|
frameworks => $frameworks,
|
|
breeding_count => $countbr,
|
|
breeding_loop => $breeding_loop,
|
|
z3950_search_params => C4::Search::z3950_search_args($query),
|
|
);
|
|
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
|