#A script that lets the user populate a basket from an iso2709 file
#the script first displays a list of import batches, then when a batch is selected displays all the biblios in it.
#The user can then pick which biblios he wants to order
-#written by john.soros@biblibre.com 01/12/2008
-# Copyright 2008 - 2009 BibLibre SARL
+# Copyright 2008 - 2011 BibLibre SARL
#
# 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 2 of the License, or (at your option) any later
-# version.
+# 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.
+# 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, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
+
+use Modern::Perl;
+use CGI qw ( -utf8 );
+use Carp;
+use YAML qw/Load/;
-use strict;
-use warnings;
-use CGI;
use C4::Context;
use C4::Auth;
-use C4::Input;
use C4::Output;
-use C4::ImportBatch qw/GetImportBatchRangeDesc GetNumberOfNonZ3950ImportBatches GetImportRecordMatches GetImportBibliosRange GetImportBatchOverlayAction GetImportBatchNoMatchAction GetImportBatchItemAction GetImportRecordMarc GetImportBatch/;
+use C4::ImportBatch;
use C4::Matcher;
-use C4::Search qw/FindDuplicate BiblioAddAuthorities/;
-use C4::Acquisition qw/NewOrder/;
+use C4::Search qw/FindDuplicate/;
+use C4::Acquisition;
use C4::Biblio;
use C4::Items;
-use C4::Koha qw/GetItemTypes/;
-use C4::Budgets qw/GetBudgets/;
-use C4::Acquisition qw/NewOrderItem/;
-use C4::Bookseller qw/GetBookSellerFromId/;
+use C4::Koha;
+use C4::Budgets;
+use C4::Acquisition;
+use C4::Suggestions; # GetSuggestion
+use C4::Members;
+
+use Koha::Number::Price;
+use Koha::Acquisition::Currencies;
+use Koha::Acquisition::Order;
+use Koha::Acquisition::Bookseller;
my $input = new CGI;
-my ($template, $loggedinuser, $cookie) = get_template_and_user({
- template_name => "acqui/addorderiso2709.tmpl",
- query => $input,
- type => "intranet",
- authnotrequired => 0,
- flagsrequired => { acquisition => 'order_manage' },
- debug => 1,
- });
+my ($template, $loggedinuser, $cookie, $userflags) = get_template_and_user({
+ template_name => "acqui/addorderiso2709.tt",
+ query => $input,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => { acquisition => 'order_manage' },
+ debug => 1,
+});
+
my $cgiparams = $input->Vars;
-my $op = $cgiparams->{'op'};
+my $op = $cgiparams->{'op'} || '';
my $booksellerid = $input->param('booksellerid');
-my $bookseller = GetBookSellerFromId($booksellerid);
+my $allmatch = $input->param('allmatch');
+my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
$template->param(scriptname => "/cgi-bin/koha/acqui/addorderiso2709.pl",
booksellerid => $booksellerid,
booksellername => $bookseller->{name},
);
-my $ordernumber;
if ($cgiparams->{'import_batch_id'} && $op eq ""){
$op = "batch_details";
die "Basketnumber required to order from iso2709 file import";
}
+#
+# 1st step = choose the file to import into acquisition
+#
if ($op eq ""){
$template->param("basketno" => $cgiparams->{'basketno'});
#display batches
import_batches_list($template);
+#
+# 2nd step = display the content of the chosen file
+#
} elsif ($op eq "batch_details"){
#display lines inside the selected batch
+ # get currencies (for change rates calcs if needed)
+ my @currencies = Koha::Acquisition::Currencies->search;
+
$template->param("batch_details" => 1,
- "basketno" => $cgiparams->{'basketno'});
+ "basketno" => $cgiparams->{'basketno'},
+ currencies => \@currencies,
+ bookseller => $bookseller,
+ "allmatch" => $allmatch,
+ );
import_biblios_list($template, $cgiparams->{'import_batch_id'});
-
-} elsif ($op eq 'import_records'){
+ my $basket = GetBasket($cgiparams->{basketno});
+ if ( C4::Context->preference('AcqCreateItem') eq 'ordering' && !$basket->{is_standing} ) {
+ # prepare empty item form
+ my $cell = PrepareItemrecordDisplay( '', '', '', 'ACQ' );
+
+ # warn "==> ".Data::Dumper::Dumper($cell);
+ unless ($cell) {
+ $cell = PrepareItemrecordDisplay( '', '', '', '' );
+ $template->param( 'NoACQframework' => 1 );
+ }
+ my @itemloop;
+ push @itemloop, $cell;
+
+ $template->param( items => \@itemloop );
+ }
+#
+# 3rd step = import the records
+#
+} elsif ( $op eq 'import_records' ) {
#import selected lines
$template->param('basketno' => $cgiparams->{'basketno'});
# Budget_id is mandatory for adding an order, we just add a default, the user needs to modify this aftewards
# retrieve the file you want to import
my $import_batch_id = $cgiparams->{'import_batch_id'};
- my $biblios = GetImportBibliosRange($import_batch_id);
+ my $biblios = GetImportRecordsRange($import_batch_id);
+ my $duplinbatch;
+ my $imported = 0;
+ my @import_record_id_selected = $input->multi_param("import_record_id");
+ my @quantities = $input->multi_param('quantity');
+ my @prices = $input->multi_param('price');
+ my @budgets_id = $input->multi_param('budget_id');
+ my @discount = $input->multi_param('discount');
+ my @sort1 = $input->multi_param('sort1');
+ my @sort2 = $input->multi_param('sort2');
+ my $active_currency = Koha::Acquisition::Currencies->get_active;
for my $biblio (@$biblios){
- if($cgiparams->{'order-'.$biblio->{'import_record_id'}}){
- my ($marcblob, $encoding) = GetImportRecordMarc($biblio->{'import_record_id'});
- my $marcrecord = MARC::Record->new_from_usmarc($marcblob) || die "couldn't translate marc information";
- my ($duplicatetitle, $biblionumber);
- if(!(($biblionumber,$duplicatetitle) = FindDuplicate($marcrecord))){
-#FIXME: missing: marc21 support (should be same with different field)
- if ( C4::Context->preference("marcflavour") eq 'UNIMARC' ) {
- my $itemtypeid = "itemtype-" . $biblio->{'import_record_id'};
- $marcrecord->field(200)->update("b" => $cgiparams->{$itemtypeid});
- }
- # add the biblio
- my $bibitemnum;
- # remove ISBN -
- my ($isbnfield,$isbnsubfield) = GetMarcFromKohaField('biblioitems.isbn','');
- if ( $marcrecord->field($isbnfield) ) {
- foreach my $field ( $marcrecord->field($isbnfield) ) {
- foreach my $subfield ( $field->subfield($isbnsubfield) ) {
- my $newisbn = $field->subfield($isbnsubfield);
- $newisbn =~ s/-//g;
- $field->update( $isbnsubfield => $newisbn );
- }
+ # Check if this import_record_id was selected
+ next if not grep { $_ eq $$biblio{import_record_id} } @import_record_id_selected;
+ my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} );
+ my $marcrecord = MARC::Record->new_from_usmarc($marcblob) || die "couldn't translate marc information";
+ my $match = GetImportRecordMatches( $biblio->{'import_record_id'}, 1 );
+ my $biblionumber=$#$match > -1?$match->[0]->{'biblionumber'}:0;
+ my $c_quantity = shift( @quantities ) || GetMarcQuantity($marcrecord, C4::Context->preference('marcflavour') ) || 1;
+ my $c_budget_id = shift( @budgets_id ) || $input->param('all_budget_id') || $budget_id;
+ my $c_discount = shift ( @discount);
+ $c_discount = $c_discount / 100 if $c_discount > 1;
+ my $c_sort1 = shift( @sort1 ) || $input->param('all_sort1') || '';
+ my $c_sort2 = shift( @sort2 ) || $input->param('all_sort2') || '';
+
+ # 1st insert the biblio, or find it through matcher
+ unless ( $biblionumber ) {
+ $duplinbatch=$import_batch_id and next if FindDuplicate($marcrecord);
+ # add the biblio
+ my $bibitemnum;
+
+ # remove ISBN -
+ my ( $isbnfield, $isbnsubfield ) = GetMarcFromKohaField( 'biblioitems.isbn', '' );
+ if ( $marcrecord->field($isbnfield) ) {
+ foreach my $field ( $marcrecord->field($isbnfield) ) {
+ foreach my $subfield ( $field->subfield($isbnsubfield) ) {
+ my $newisbn = $field->subfield($isbnsubfield);
+ $newisbn =~ s/-//g;
+ $field->update( $isbnsubfield => $newisbn );
}
}
-
- ( $biblionumber, $bibitemnum ) = AddBiblio( $marcrecord, $cgiparams->{'frameworkcode'} || '' );
- } else {
- warn("Duplicate item found: ", $biblionumber, "; Duplicate: ", $duplicatetitle);
}
+ ( $biblionumber, $bibitemnum ) = AddBiblio( $marcrecord, $cgiparams->{'frameworkcode'} || '' );
+ SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' );
+ # 2nd add authorities if applicable
if (C4::Context->preference("BiblioAddsAuthorities")){
- my ($countlinked,$countcreated)=BiblioAddAuthorities($marcrecord, $cgiparams->{'frameworkcode'});
- }
- my $patron = C4::Members->GetMember(borrowernumber => $loggedinuser);
- my $branch = C4::Branch->GetBranchDetail($patron->{branchcode});
- my ($invoice);
- my %orderinfo = ("biblionumber", $biblionumber,
- "basketno", $cgiparams->{'basketno'},
- "quantity", $cgiparams->{'quantityrec-' . $biblio->{'import_record_id'}},
- "branchcode", $branch,
- "booksellerinvoicenumber", $invoice,
- "budget_id", $budget_id,
- "uncertainprice", 1,
- );
- # get the price if there is one.
- # filter by storing only the 1st number
- # we suppose the currency is correct, as we have no possibilities to get it.
- if ($marcrecord->subfield("345","d")) {
- $orderinfo{'listprice'} = $marcrecord->subfield("345","d");
- if ($orderinfo{'listprice'} =~ /^([\d\.,]*)/) {
- $orderinfo{'listprice'} = $1;
- $orderinfo{'listprice'} =~ s/,/\./;
- eval "use C4::Acquisition qw/GetBasket/;";
- eval "use C4::Bookseller qw/GetBookSellerFromId/;";
- my $basket = GetBasket($orderinfo{basketno});
- my $bookseller = GetBookSellerFromId($basket->{booksellerid});
- # '//' is like '||' but tests for defined, rather than true
- my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
- $orderinfo{'unitprice'} = $orderinfo{listprice} - ($orderinfo{listprice} * ($bookseller->{discount} / 100));
- $orderinfo{'ecost'} = $orderinfo{unitprice};
- } else {
- $orderinfo{'listprice'} = 0;
- }
- $orderinfo{'rrp'} = $orderinfo{'listprice'};
+ my $headings_linked =BiblioAutoLink($marcrecord, $cgiparams->{'frameworkcode'});
}
- elsif ($marcrecord->subfield("010","d")) {
- $orderinfo{'listprice'} = $marcrecord->subfield("010","d");
- if ($orderinfo{'listprice'} =~ /^([\d\.,]*)/) {
- $orderinfo{'listprice'} = $1;
- $orderinfo{'listprice'} =~ s/,/\./;
- eval "use C4::Acquisition qw/GetBasket/;";
- eval "use C4::Bookseller qw/GetBookSellerFromId/;";
- my $basket = GetBasket($orderinfo{basketno});
- my $bookseller = GetBookSellerFromId($basket->{booksellerid});
- my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
- $orderinfo{'unitprice'} = $orderinfo{listprice} - ($orderinfo{listprice} * ($bookseller->{discount} / 100));
- $orderinfo{'ecost'} = $orderinfo{unitprice};
- } else {
- $orderinfo{'listprice'} = 0;
- }
- $orderinfo{'rrp'} = $orderinfo{'listprice'};
- }
- # remove uncertainprice flag if we have found a price in the MARC record
- $orderinfo{uncertainprice} = 0 if $orderinfo{listprice};
- my $basketno;
- ( $basketno, $ordernumber ) = NewOrder(\%orderinfo);
-
- # now, add items if applicable
- # parse all items sent by the form, and create an item just for the import_record_id we are dealing with
- # this is not optimised, but it's working !
- if (C4::Context->preference('AcqCreateItem') eq 'ordering') {
- my @tags = $input->param('tag');
- my @subfields = $input->param('subfield');
- my @field_values = $input->param('field_value');
- my @serials = $input->param('serial');
- my @itemids = $input->param('itemid'); # hint : in iso2709, the itemid contains the import_record_id, not an item id. It is used to get the right item, as we have X biblios.
- my @ind_tag = $input->param('ind_tag');
- my @indicator = $input->param('indicator');
- #Rebuilding ALL the data for items into a hash
- # parting them on $itemid.
- my %itemhash;
- my $range=scalar(@itemids);
-
- my $i = 0;
- my @items;
- for my $itemid (@itemids){
- my $realitemid; #javascript generated random itemids, in the form itemid-randomnumber, $realitemid is the itemid, while $itemid is the itemide parsed from the html
- if ($itemid =~ m/(\d+)-.*/){
- my @splits = split(/-/, $itemid);
- $realitemid = $splits[0];
- }
- if ( ( $realitemid && $cgiparams->{'order-'. $realitemid} && $realitemid eq $biblio->{import_record_id}) || ($itemid && $cgiparams->{'order-'. $itemid} && $itemid eq $biblio->{import_record_id}) ){
- my ($item, $found);
- for my $tmpitem (@items){
- if ($tmpitem->{itemid} eq $itemid){
- $item = $tmpitem;
- $found = 1;
- }
- }
- push @{$item->{tags}}, $tags[$i];
- push @{$item->{subfields}}, $subfields[$i];
- push @{$item->{field_values}}, $field_values[$i];
- push @{$item->{ind_tag}}, $ind_tag[$i];
- push @{$item->{indicator}}, $indicator[$i];
- $item->{itemid} = $itemid;
- if (! $found){
- push @items, $item;
- }
- }
- ++$i
+ } else {
+ SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' );
+ }
+ # 3rd add order
+ my $patron = C4::Members::GetMember( borrowernumber => $loggedinuser );
+ # get quantity in the MARC record (1 if none)
+ my $quantity = GetMarcQuantity($marcrecord, C4::Context->preference('marcflavour')) || 1;
+ my %orderinfo = (
+ biblionumber => $biblionumber,
+ basketno => $cgiparams->{'basketno'},
+ quantity => $c_quantity,
+ branchcode => $patron->{branchcode},
+ budget_id => $c_budget_id,
+ uncertainprice => 1,
+ sort1 => $c_sort1,
+ sort2 => $c_sort2,
+ order_internalnote => $cgiparams->{'all_order_internalnote'},
+ order_vendornote => $cgiparams->{'all_order_vendornote'},
+ currency => $cgiparams->{'all_currency'},
+ );
+ # get the price if there is one.
+ my $price= shift( @prices ) || GetMarcPrice($marcrecord, C4::Context->preference('marcflavour'));
+ if ($price){
+ # in France, the cents separator is the , but sometimes, ppl use a .
+ # in this case, the price will be x100 when unformatted ! Replace the . by a , to get a proper price calculation
+ $price =~ s/\./,/ if C4::Context->preference("CurrencyFormat") eq "FR";
+ $price = Koha::Number::Price->new($price)->unformat;
+ $orderinfo{tax_rate} = $bookseller->{tax_rate};
+ my $c = $c_discount ? $c_discount : $bookseller->{discount} / 100;
+ if ( $bookseller->{listincgst} ) {
+ if ( $c_discount ) {
+ $orderinfo{ecost} = $price;
+ $orderinfo{rrp} = $orderinfo{ecost} / ( 1 - $c );
+ } else {
+ $orderinfo{ecost} = $price * ( 1 - $c );
+ $orderinfo{rrp} = $price;
}
- foreach my $item (@items){
- my $xml = TransformHtmlToXml( $item->{'tags'},
- $item->{'subfields'},
- $item->{'field_values'},
- $item->{'ind_tag'},
- $item->{'indicator'});
- my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
- my ($biblionumber,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber);
- NewOrderItem( $itemnumber, $ordernumber);
+ } else {
+ if ( $c_discount ) {
+ $orderinfo{ecost} = $price / ( 1 + $orderinfo{tax_rate} );
+ $orderinfo{rrp} = $orderinfo{ecost} / ( 1 - $c );
+ } else {
+ $orderinfo{rrp} = $price / ( 1 + $orderinfo{tax_rate} );
+ $orderinfo{ecost} = $orderinfo{rrp} * ( 1 - $c );
}
}
+ $orderinfo{listprice} = $orderinfo{rrp} / $active_currency->rate;
+ $orderinfo{unitprice} = $orderinfo{ecost};
+ $orderinfo{total} = $orderinfo{ecost} * $c_quantity;
+ } else {
+ $orderinfo{listprice} = 0;
}
+
+ # remove uncertainprice flag if we have found a price in the MARC record
+ $orderinfo{uncertainprice} = 0 if $orderinfo{listprice};
+ my $order = Koha::Acquisition::Order->new( \%orderinfo )->insert;
+
+ # 4th, add items if applicable
+ # parse the item sent by the form, and create an item just for the import_record_id we are dealing with
+ # this is not optimised, but it's working !
+ my $basket = GetBasket($cgiparams->{basketno});
+ if ( C4::Context->preference('AcqCreateItem') eq 'ordering' && !$basket->{is_standing} ) {
+ my @tags = $input->multi_param('tag');
+ my @subfields = $input->multi_param('subfield');
+ my @field_values = $input->multi_param('field_value');
+ my @serials = $input->multi_param('serial');
+ my @ind_tag = $input->multi_param('ind_tag');
+ my @indicator = $input->multi_param('indicator');
+ my $item;
+ push @{ $item->{tags} }, $tags[0];
+ push @{ $item->{subfields} }, $subfields[0];
+ push @{ $item->{field_values} }, $field_values[0];
+ push @{ $item->{ind_tag} }, $ind_tag[0];
+ push @{ $item->{indicator} }, $indicator[0];
+ my $xml = TransformHtmlToXml( \@tags, \@subfields, \@field_values, \@indicator, \@ind_tag );
+ my $record = MARC::Record::new_from_xml( $xml, 'UTF-8' );
+ for (my $qtyloop=1;$qtyloop <= $c_quantity;$qtyloop++) {
+ my ( $biblionumber, $bibitemnum, $itemnumber ) = AddItemFromMarc( $record, $biblionumber );
+ $order->add_item( $itemnumber );
+ }
+ } else {
+ SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' );
+ }
+ $imported++;
}
# go to basket page
- print $input->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=".$cgiparams->{'basketno'});
+ if ( $imported ) {
+ print $input->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=".$cgiparams->{'basketno'}."&duplinbatch=$duplinbatch");
+ } else {
+ print $input->redirect("/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=$import_batch_id&basketno=".$cgiparams->{'basketno'}."&booksellerid=$booksellerid&allmatch=1");
+ }
exit;
}
+
+my $budgets = GetBudgets();
+my $budget_id = @$budgets[0]->{'budget_id'};
+# build bookfund list
+my $borrower = GetMember( 'borrowernumber' => $loggedinuser );
+my ( $flags, $homebranch ) = ( $borrower->{'flags'}, $borrower->{'branchcode'} );
+my $budget = GetBudget($budget_id);
+
+# build budget list
+my $budget_loop = [];
+my $budgets_hierarchy = GetBudgetHierarchy;
+foreach my $r ( @{$budgets_hierarchy} ) {
+ next unless (CanUserUseBudget($borrower, $r, $userflags));
+ if ( !defined $r->{budget_amount} || $r->{budget_amount} == 0 ) {
+ next;
+ }
+ push @{$budget_loop},
+ { b_id => $r->{budget_id},
+ b_txt => $r->{budget_name},
+ b_sort1_authcat => $r->{'sort1_authcat'},
+ b_sort2_authcat => $r->{'sort2_authcat'},
+ b_active => $r->{budget_period_active},
+ b_sel => ( $r->{budget_id} == $budget_id ) ? 1 : 0,
+ };
+}
+
+@{$budget_loop} =
+ sort { uc( $a->{b_txt}) cmp uc( $b->{b_txt}) } @{$budget_loop};
+
+$template->param( budget_loop => $budget_loop,);
+
output_html_with_http_headers $input, $cookie, $template->output;
my @list = ();
foreach my $batch (@$batches) {
- if ($batch->{'import_status'} eq "staged") {
- push @list, {
- import_batch_id => $batch->{'import_batch_id'},
- num_biblios => $batch->{'num_biblios'},
- num_items => $batch->{'num_items'},
- upload_timestamp => $batch->{'upload_timestamp'},
- import_status => $batch->{'import_status'},
- file_name => $batch->{'file_name'},
- comments => $batch->{'comments'},
- };
+ if ( $batch->{'import_status'} =~ /^staged$|^reverted$/ && $batch->{'record_type'} eq 'biblio') {
+ # check if there is at least 1 line still staged
+ my $stagedList=GetImportRecordsRange($batch->{'import_batch_id'}, undef, 1, $batch->{import_status}, { order_by_direction => 'ASC' });
+ if (scalar @$stagedList) {
+ push @list, {
+ import_batch_id => $batch->{'import_batch_id'},
+ num_records => $batch->{'num_records'},
+ num_items => $batch->{'num_items'},
+ staged_date => $batch->{'upload_timestamp'},
+ import_status => $batch->{'import_status'},
+ file_name => $batch->{'file_name'},
+ comments => $batch->{'comments'},
+ };
+ } else {
+ # if there are no more line to includes, set the status to imported
+ SetImportBatchStatus( $batch->{'import_batch_id'}, 'imported' );
+ }
}
}
$template->param(batch_list => \@list);
sub import_biblios_list {
my ($template, $import_batch_id) = @_;
my $batch = GetImportBatch($import_batch_id,'staged');
- my $biblios = GetImportBibliosRange($import_batch_id,'','','staged');
+ return () unless $batch and $batch->{import_status} =~ /^staged$|^reverted$/;
+ my $biblios = GetImportRecordsRange($import_batch_id,'','',$batch->{import_status});
my @list = ();
-# # Itemtype is mandatory for adding a biblioitem, we just add a default, the user needs to modify this aftewards
-# my $itemtypehash = GetItemTypes();
-# my @itemtypes;
-# for my $key (sort { $itemtypehash->{$a}->{description} cmp $itemtypehash->{$b}->{description} } keys %$itemtypehash) {
-# push(@itemtypes, $itemtypehash->{$key});
-# }
+
foreach my $biblio (@$biblios) {
my $citation = $biblio->{'title'};
$citation .= " $biblio->{'author'}" if $biblio->{'author'};
record_sequence => $biblio->{'record_sequence'},
overlay_status => $biblio->{'overlay_status'},
match_biblionumber => $#$match > -1 ? $match->[0]->{'biblionumber'} : 0,
- match_citation => $#$match > -1 ? $match->[0]->{'title'} . ' ' . $match->[0]->{'author'} : '',
+ match_citation => $#$match > -1 ? $match->[0]->{'title'} || '' . ' ' . $match->[0]->{'author'} || '': '',
match_score => $#$match > -1 ? $match->[0]->{'score'} : 0,
-# itemtypes => \@itemtypes,
);
-# if (C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber) {
-# # prepare empty item form
-# my $cell = PrepareItemrecordDisplay();
-# my @itemloop;
-# push @itemloop,$cell;
-# $cellrecord{'items'} = \@itemloop;
-# }
- push @list, \%cellrecord;
-
+ my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} );
+ my $marcrecord = MARC::Record->new_from_usmarc($marcblob) || die "couldn't translate marc information";
+ my $infos = get_infos_syspref($marcrecord, ['price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2']);
+ my $price = $infos->{price};
+ my $quantity = $infos->{quantity};
+ my $budget_code = $infos->{budget_code};
+ my $discount = $infos->{discount};
+ my $sort1 = $infos->{sort1};
+ my $sort2 = $infos->{sort2};
+ my $budget_id;
+ if($budget_code) {
+ my $biblio_budget = GetBudgetByCode($budget_code);
+ if($biblio_budget) {
+ $budget_id = $biblio_budget->{budget_id};
+ }
+ }
+ $cellrecord{price} = $price || '';
+ $cellrecord{quantity} = $quantity || '';
+ $cellrecord{budget_id} = $budget_id || '';
+ $cellrecord{discount} = $discount || '';
+ $cellrecord{sort1} = $sort1 || '';
+ $cellrecord{sort2} = $sort2 || '';
+ push @list, \%cellrecord;
}
- my $num_biblios = $batch->{'num_biblios'};
+ my $num_records = $batch->{'num_records'};
my $overlay_action = GetImportBatchOverlayAction($import_batch_id);
my $nomatch_action = GetImportBatchNoMatchAction($import_batch_id);
my $item_action = GetImportBatchItemAction($import_batch_id);
$template->param(biblio_list => \@list,
- num_results => $num_biblios,
+ num_results => $num_records,
import_batch_id => $import_batch_id,
"overlay_action_${overlay_action}" => 1,
overlay_action => $overlay_action,
comments => $batch->{'comments'},
import_status => $batch->{'import_status'},
upload_timestamp => $batch->{'upload_timestamp'},
- num_biblios => $batch->{'num_biblios'},
- num_items => $batch->{'num_biblios'});
- if ($batch->{'num_biblios'} > 0) {
+ num_records => $batch->{'num_records'},
+ num_items => $batch->{'num_items'});
+ if ($batch->{'num_records'} > 0) {
if ($batch->{'import_status'} eq 'staged' or $batch->{'import_status'} eq 'reverted') {
$template->param(can_commit => 1);
}
'current_matcher_description' => $matcher->description());
}
}
- add_matcher_list($batch->{'matcher_id'});
+ add_matcher_list($batch->{'matcher_id'}, $template);
}
sub add_matcher_list {
- my $current_matcher_id = shift;
+ my ($current_matcher_id, $template) = @_;
my @matchers = C4::Matcher::GetMatcherList();
if (defined $current_matcher_id) {
for (my $i = 0; $i <= $#matchers; $i++) {
}
$template->param(available_matchers => \@matchers);
}
+
+sub get_infos_syspref {
+ my ($record, $field_list) = @_;
+ my $syspref = C4::Context->preference('MarcFieldsToOrder');
+ $syspref = "$syspref\n\n"; # YAML is anal on ending \n. Surplus does not hurt
+ my $yaml = eval {
+ YAML::Load($syspref);
+ };
+ if ( $@ ) {
+ warn "Unable to parse MarcFieldsToOrder syspref : $@";
+ return ();
+ }
+ my $r;
+ for my $field_name ( @$field_list ) {
+ next unless exists $yaml->{$field_name};
+ my @fields = split /\|/, $yaml->{$field_name};
+ for my $field ( @fields ) {
+ my ( $f, $sf ) = split /\$/, $field;
+ next unless $f and $sf;
+ if ( my $v = $record->subfield( $f, $sf ) ) {
+ $r->{$field_name} = $v;
+ }
+ last if $yaml->{$field};
+ }
+ }
+ return $r;
+}
projects / koha.git / blobdiff