use C4::Charset;
use C4::AuthoritiesMarc;
use C4::MarcModificationTemplates;
+use Koha::Items;
use Koha::Plugins::Handler;
use Koha::Logger;
( $batch_id, $num_records, $num_items, @invalid_records ) =
BatchStageMarcRecords(
- $encoding, $marc_records,
- $file_name, $to_marc_plugin,
+ $record_type, $encoding,
+ $marc_records, $file_name,
$marc_modification_template, $comments,
$branch_code, $parse_items,
$leave_as_staging, $progress_interval,
my $encoding = shift;
my $marc_records = shift;
my $file_name = shift;
- my $to_marc_plugin = shift;
my $marc_modification_template = shift;
my $comments = shift;
my $branch_code = shift;
SetImportBatchItemAction($batch_id, 'ignore');
}
- $marc_records = Koha::Plugins::Handler->run(
- {
- class => $to_marc_plugin,
- method => 'to_marc',
- params => { data => $marc_records }
- }
- ) if $to_marc_plugin && @$marc_records;
my $marc_type = C4::Context->preference('marcflavour');
$marc_type .= 'AUTH' if ($marc_type eq 'UNIMARC' && $record_type eq 'auth');
$recordid = $record_match;
my $oldxml;
if ($record_type eq 'biblio') {
- my $oldbiblio = GetBiblio($recordid);
+ my $oldbiblio = Koha::Biblios->find( $recordid );
$oldxml = GetXmlBiblio($recordid);
# remove item fields so that they don't get
}
$oldxml = $old_marc->as_xml($marc_type);
- ModBiblio($marc_record, $recordid, $oldbiblio->{'frameworkcode'});
+ ModBiblio($marc_record, $recordid, $oldbiblio->frameworkcode);
$query = "UPDATE import_biblios SET matched_biblionumber = ? WHERE import_record_id = ?";
if ($item_result eq 'create_new' || $item_result eq 'replace') {
my $item = TransformMarcToKoha( $item_marc );
- my $duplicate_barcode = exists( $item->{'barcode'} ) && GetItemnumberFromBarcode( $item->{'barcode'} );
+ my $duplicate_barcode = exists( $item->{'barcode'} ) && Koha::Items->find({ barcode => $item->{'barcode'} });
my $duplicate_itemnumber = exists( $item->{'itemnumber'} );
my $updsth = $dbh->prepare("UPDATE import_items SET status = ?, itemnumber = ? WHERE import_items_id = ?");
$updsth->finish();
$num_items_replaced++;
} elsif ( $action eq "replace" && $duplicate_barcode ) {
- my $itemnumber = GetItemnumberFromBarcode( $item->{'barcode'} );
+ my $itemnumber = $duplicate_barcode->itemnumber;
ModItemFromMarc( $item_marc, $biblionumber, $itemnumber );
$updsth->bind_param( 1, 'imported' );
$updsth->bind_param( 2, $item->{itemnumber} );
my $old_record = MARC::Record->new_from_xml(StripNonXmlChars($rowref->{'marcxml_old'}), 'UTF-8', $rowref->{'encoding'}, $marc_type);
if ($record_type eq 'biblio') {
my $biblionumber = $rowref->{'matched_biblionumber'};
- my $oldbiblio = GetBiblio($biblionumber);
+ my $oldbiblio = Koha::Biblios->find( $biblionumber );
$logger->info("C4::ImportBatch::BatchRevertRecords: Biblio record $biblionumber does not exist, restoration of this record was skipped") unless $oldbiblio;
next unless $oldbiblio; # Record has since been deleted. Deleted records should stay deleted.
$num_items_deleted += BatchRevertItems($rowref->{'import_record_id'}, $rowref->{'matched_biblionumber'});
- ModBiblio($old_record, $biblionumber, $oldbiblio->{'frameworkcode'});
+ ModBiblio($old_record, $biblionumber, $oldbiblio->frameworkcode);
} else {
my $authid = $rowref->{'matched_authid'};
ModAuthority($authid, $old_record, GuessAuthTypeCode($old_record));
sub GetItemNumbersFromImportBatch {
my ($batch_id) = @_;
my $dbh = C4::Context->dbh;
- my $sth = $dbh->prepare("SELECT items.itemnumber FROM import_batches,import_records,import_items, items WHERE import_batches.import_batch_id=import_records.import_batch_id AND import_records.import_record_id=import_items.import_record_id AND items.itemnumber=import_items.itemnumber AND import_batches.import_batch_id=?");
+ my $sql = q|
+SELECT itemnumber FROM import_items
+INNER JOIN items USING (itemnumber)
+INNER JOIN import_records USING (import_record_id)
+WHERE import_batch_id = ?|;
+ my $sth = $dbh->prepare( $sql );
$sth->execute($batch_id);
my @items ;
while ( my ($itm) = $sth->fetchrow_array ) {
( $order_by ) = grep( /^$order_by$/, qw( import_record_id title status overlay_status ) ) ? $order_by : 'import_record_id';
my $order_by_direction =
- uc( $parameters->{order_by_direction} ) eq 'DESC' ? 'DESC' : 'ASC';
+ uc( $parameters->{order_by_direction} // 'ASC' ) eq 'DESC' ? 'DESC' : 'ASC';
$order_by .= " $order_by_direction, authorized_heading" if $order_by eq 'title';
return (\@errors, \@marcRecords);
}
+=head2 RecordsFromMarcPlugin
+
+ Converts text of input_file into array of MARC records with to_marc plugin
+
+=cut
+
+sub RecordsFromMarcPlugin {
+ my ($input_file, $plugin_class, $encoding) = @_;
+ my ( $text, @return );
+ return \@return if !$input_file || !$plugin_class;
+
+ # Read input file
+ open IN, "<$input_file" or die "$0: cannot open input file $input_file: $!\n";
+ $/ = "\035";
+ while (<IN>) {
+ s/^\s+//;
+ s/\s+$//;
+ next unless $_;
+ $text .= $_;
+ }
+ close IN;
+
+ # Convert to large MARC blob with plugin
+ $text = Koha::Plugins::Handler->run({
+ class => $plugin_class,
+ method => 'to_marc',
+ params => { data => $text },
+ }) if $text;
+
+ # Convert to array of MARC records
+ if( $text ) {
+ my $marc_type = C4::Context->preference('marcflavour');
+ foreach my $blob ( split(/\x1D/, $text) ) {
+ next if $blob =~ /^\s*$/;
+ my ($marcrecord) = MarcToUTF8Record($blob, $marc_type, $encoding);
+ push @return, $marcrecord;
+ }
+ }
+ return \@return;
+}
+
# internal functions
sub _create_import_record {
my ($batch_id, $record_sequence, $marc_record, $record_type, $encoding, $z3950random, $marc_type) = @_;
my $dbh = C4::Context->dbh;
- my $sth = $dbh->prepare("INSERT INTO import_records (import_batch_id, record_sequence, marc, marcxml,
+ my $sth = $dbh->prepare("INSERT INTO import_records (import_batch_id, record_sequence, marc, marcxml, marcxml_old,
record_type, encoding, z3950random)
- VALUES (?, ?, ?, ?, ?, ?, ?)");
- $sth->execute($batch_id, $record_sequence, $marc_record->as_usmarc(), $marc_record->as_xml($marc_type),
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?)");
+ $sth->execute($batch_id, $record_sequence, $marc_record->as_usmarc(), $marc_record->as_xml($marc_type), '',
$record_type, $encoding, $z3950random);
my $import_record_id = $dbh->{'mysql_insertid'};
$sth->finish();
projects / koha.git / blobdiff