X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;ds=inline;f=C4%2FBreeding.pm;h=9003f9acb3dd7c2a25d8850ee43ad2aca2efa3e5;hb=d76dbace5e6436ae5244876b52ffcdc4831f91db;hp=abea5de79c2bae651fa77654c0f92223c96b5a3b;hpb=2ffd5b7228f4e638583162d483e1dd2febeafe1b;p=koha_gimpoz diff --git a/C4/Breeding.pm b/C4/Breeding.pm index abea5de79c..9003f9acb3 100644 --- a/C4/Breeding.pm +++ b/C4/Breeding.pm @@ -13,34 +13,44 @@ package C4::Breeding; # 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., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# 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. use strict; +use warnings; + use C4::Biblio; use C4::Koha; +use C4::Charset; use MARC::File::USMARC; -require Exporter; +use C4::ImportBatch; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); -# set the version for version checking -$VERSION = 0.01; +BEGIN { + # set the version for version checking + $VERSION = 0.02; + require Exporter; + @ISA = qw(Exporter); + @EXPORT = qw(&ImportBreeding &BreedingSearch); +} =head1 NAME -C4::Breeding : script to add a biblio in marc_breeding table. +C4::Breeding : module to add biblios to import_records via + the breeding/reservoir API. =head1 SYNOPSIS use C4::Scan; - &ImportBreeding($marcrecords,$overwrite_biblio,$filename,$z3950random); + &ImportBreeding($marcrecords,$overwrite_biblio,$filename,$z3950random,$batch_type); C<$marcrecord> => the MARC::Record C<$overwrite_biblio> => if set to 1 a biblio with the same ISBN will be overwritted. if set to 0 a biblio with the same isbn will be ignored (the previous will be kept) - if set to -1 the biblio will be added anyway (more than 1 biblio with the same ISBN possible in the breeding + if set to -1 the biblio will be added anyway (more than 1 biblio with the same ISBN + possible in the breeding C<$encoding> => USMARC or UNIMARC. used for char_decoding. If not present, the parameter marcflavour is used instead @@ -48,27 +58,37 @@ C4::Breeding : script to add a biblio in marc_breeding table. =head1 DESCRIPTION - ImportBreeding import MARC records in the reservoir (marc_breeding table). + ImportBreeding import MARC records in the reservoir (import_records/import_batches tables). the records can be properly encoded or not, we try to reencode them in utf-8 if needed. works perfectly with BNF server, that sends UNIMARC latin1 records. Should work with other servers too. - the FixEncoding sub is in Koha.pm, as it's a general usage sub. -=cut +=head2 ImportBreeding + + ImportBreeding($marcrecords,$overwrite_biblio,$filename,$encoding,$z3950random,$batch_type); + + TODO description -@ISA = qw(Exporter); -@EXPORT = qw(&ImportBreeding &BreedingSearch); +=cut -sub ImportBreeding { - my ($marcrecords,$overwrite_biblio,$filename,$encoding,$z3950random) = @_; +sub ImportBreeding { + my ($marcrecords,$overwrite_biblio,$filename,$encoding,$z3950random,$batch_type) = @_; my @marcarray = split /\x1D/, $marcrecords; + my $dbh = C4::Context->dbh; + + my $batch_id = 0; + if ($batch_type eq 'z3950') { + $batch_id = GetZ3950BatchId($filename); + } else { + # create a new one + $batch_id = AddImportBatch('create_new', 'staging', 'batch', $filename, ''); + } my $searchisbn = $dbh->prepare("select biblioitemnumber from biblioitems where isbn=?"); my $searchissn = $dbh->prepare("select biblioitemnumber from biblioitems where issn=?"); - my $searchbreeding = $dbh->prepare("select id from marc_breeding -where isbn=? and title=?"); - my $insertsql = $dbh->prepare("insert into marc_breeding (file,isbn,title,author,marc,encoding,z3950random) values(?,?,?,?,?,?,?)"); - my $replacesql = $dbh->prepare("update marc_breeding set file=?,isbn=?,title=?,author=?,marc=?,encoding=?,z3950random=? where id=?"); - $encoding = C4::Context->preference("marcflavour") unless $encoding; + # FIXME -- not sure that this kind of checking is actually needed + my $searchbreeding = $dbh->prepare("select import_record_id from import_biblios where isbn=? and title=?"); + +# $encoding = C4::Context->preference("marcflavour") unless $encoding; # fields used for import results my $imported=0; my $alreadyindb = 0; @@ -76,22 +96,22 @@ where isbn=? and title=?"); my $notmarcrecord = 0; my $breedingid; for (my $i=0;$i<=$#marcarray;$i++) { - my $marcrecord = FixEncoding($marcarray[$i]."\x1D"); + my ($marcrecord, $charset_result, $charset_errors); + ($marcrecord, $charset_result, $charset_errors) = + MarcToUTF8Record($marcarray[$i]."\x1D", C4::Context->preference("marcflavour"), $encoding); + +# warn "$i : $marcarray[$i]"; + # FIXME - currently this does nothing my @warnings = $marcrecord->warnings(); + if (scalar($marcrecord->fields()) == 0) { $notmarcrecord++; } else { - my $oldbiblio = MARCmarc2koha($dbh,$marcrecord,''); - my $isbnlength=10; - if($oldbiblio->{isbn}){ - $isbnlength = length($oldbiblio->{isbn}); - } - # if isbn found and biblio does not exist, add it. If isbn found and biblio exists, overwrite or ignore depending on user choice + my $oldbiblio = TransformMarcToKoha($dbh,$marcrecord,''); + # if isbn found and biblio does not exist, add it. If isbn found and biblio exists, + # overwrite or ignore depending on user choice # drop every "special" char : spaces, - ... - $oldbiblio->{isbn} =~ s/ |-|\.//g, - $oldbiblio->{isbn} = substr($oldbiblio->{isbn},0,$isbnlength); - $oldbiblio->{issn} =~ s/ |-|\.//g, - $oldbiblio->{issn} = substr($oldbiblio->{issn},0,10); + $oldbiblio->{isbn} = C4::Koha::_isbn_cleanup($oldbiblio->{isbn}); # FIXME C4::Koha::_isbn_cleanup should be public # search if biblio exists my $biblioitemnumber; if ($oldbiblio->{isbn}) { @@ -99,15 +119,17 @@ where isbn=? and title=?"); ($biblioitemnumber) = $searchisbn->fetchrow; } else { if ($oldbiblio->{issn}) { - $searchissn->execute($oldbiblio->{issn}); - ($biblioitemnumber) = $searchissn->fetchrow; - } + $searchissn->execute($oldbiblio->{issn}); + ($biblioitemnumber) = $searchissn->fetchrow; + } } - if ($biblioitemnumber) { + if ($biblioitemnumber && $overwrite_biblio ne 2) { $alreadyindb++; } else { + # FIXME - in context of batch load, + # rejecting records because already present in the reservoir + # not correct in every case. # search in breeding farm -# my $breedingid; if ($oldbiblio->{isbn}) { $searchbreeding->execute($oldbiblio->{isbn},$oldbiblio->{title}); ($breedingid) = $searchbreeding->fetchrow; @@ -115,16 +137,14 @@ where isbn=? and title=?"); $searchbreeding->execute($oldbiblio->{issn},$oldbiblio->{title}); ($breedingid) = $searchbreeding->fetchrow; } - if ($breedingid && $overwrite_biblio eq 0) { + if ($breedingid && $overwrite_biblio eq '0') { $alreadyinfarm++; } else { - my $recoded; - $recoded = $marcrecord->as_usmarc(); - if ($breedingid && $overwrite_biblio eq 1) { - $replacesql ->execute($filename,substr($oldbiblio->{isbn}.$oldbiblio->{issn},0,$isbnlength),$oldbiblio->{title},$oldbiblio->{author},$recoded,$encoding,$z3950random,$breedingid); + if ($breedingid && $overwrite_biblio eq '1') { + ModBiblioInBatch($breedingid, $marcrecord); } else { - $insertsql ->execute($filename,substr($oldbiblio->{isbn}.$oldbiblio->{issn},0,$isbnlength),$oldbiblio->{title},$oldbiblio->{author},$recoded,$encoding,$z3950random); - $breedingid=$dbh->{'mysql_insertid'}; + my $import_id = AddBiblioToBatch($batch_id, $imported, $marcrecord, $encoding, $z3950random); + $breedingid = $import_id; } $imported++; } @@ -135,7 +155,7 @@ where isbn=? and title=?"); } -=item BreedingSearch +=head2 BreedingSearch ($count, @results) = &BreedingSearch($title,$isbn,$random); C<$title> contains the title, @@ -143,29 +163,35 @@ C<$isbn> contains isbn or issn, C<$random> contains the random seed from a z3950 search. C<$count> is the number of items in C<@results>. C<@results> is an -array of references-to-hash; the keys are the items from the C table of the Koha database. +array of references-to-hash; the keys are the items from the C and +C tables of the Koha database. =cut sub BreedingSearch { - my ($title,$isbn,$z3950random) = @_; + my ($search,$isbn,$z3950random) = @_; my $dbh = C4::Context->dbh; my $count = 0; my ($query,@bind); my $sth; my @results; - $query = "Select id,file,isbn,title,author from marc_breeding where "; + $query = "SELECT import_record_id, file_name, isbn, title, author + FROM import_biblios + JOIN import_records USING (import_record_id) + JOIN import_batches USING (import_batch_id) + WHERE "; if ($z3950random) { $query .= "z3950random = ?"; @bind=($z3950random); } else { + $search =~ s/(\s+)/\%/g; @bind=(); - if ($title) { - $query .= "title like ?"; - push(@bind,"$title%"); + if ($search) { + $query .= "title like ? OR author like ?"; + push(@bind,"%$search%", "%$search%"); } - if ($title && $isbn) { + if ($search && $isbn) { $query .= " and "; } if ($isbn) { @@ -177,6 +203,12 @@ sub BreedingSearch { $sth->execute(@bind); while (my $data = $sth->fetchrow_hashref) { $results[$count] = $data; + # FIXME - hack to reflect difference in name + # of columns in old marc_breeding and import_records + # There needs to be more separation between column names and + # field names used in the templates + $data->{'file'} = $data->{'file_name'}; + $data->{'id'} = $data->{'import_record_id'}; $count++; } # while @@ -184,5 +216,6 @@ sub BreedingSearch { return($count, @results); } # sub breedingsearch +1; +__END__ -END { } # module clean-up code here (global destructor)