From 2dcb5872295b6172839eb757e7c90ae6efbdb6c8 Mon Sep 17 00:00:00 2001 From: tgarip1957 Date: Fri, 1 Sep 2006 23:01:33 +0000 Subject: [PATCH] Use async ZOOM search for Z3950 A new async mode ZEBRA updating routine. We do not wailt for zebra updates anymore whether using shadow with BatchMode or not. Zebra updates in the background. System preference zebrawait determines how long zebra waits idle --- z3950/encodingfix/Biblio.pm | 2479 ------------------------------ z3950/encodingfix/README-english | 18 - z3950/encodingfix/README-polish | 18 - z3950/encodingfix/search.pl | 110 -- z3950/processz3950queue | 347 ----- z3950/search.pl | 216 ++- z3950/server/zed-koha-server.pl | 313 ---- z3950/z3950-daemon-launch.sh | 83 - z3950/z3950-daemon-shell.sh | 80 - 9 files changed, 166 insertions(+), 3498 deletions(-) delete mode 100644 z3950/encodingfix/Biblio.pm delete mode 100644 z3950/encodingfix/README-english delete mode 100644 z3950/encodingfix/README-polish delete mode 100644 z3950/encodingfix/search.pl delete mode 100755 z3950/processz3950queue delete mode 100755 z3950/server/zed-koha-server.pl delete mode 100755 z3950/z3950-daemon-launch.sh delete mode 100755 z3950/z3950-daemon-shell.sh diff --git a/z3950/encodingfix/Biblio.pm b/z3950/encodingfix/Biblio.pm deleted file mode 100644 index ac470c2a60..0000000000 --- a/z3950/encodingfix/Biblio.pm +++ /dev/null @@ -1,2479 +0,0 @@ -package C4::Biblio; -# 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 2 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, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA - -use strict; -require Exporter; -use C4::Context; -use C4::Database; -use MARC::Record; - -use vars qw($VERSION @ISA @EXPORT); - -# set the version for version checking -$VERSION = 0.01; - -@ISA = qw(Exporter); -# -# don't forget MARCxxx subs are exported only for testing purposes. Should not be used -# as the old-style API and the NEW one are the only public functions. -# -@EXPORT = qw( - &updateBiblio &updateBiblioItem &updateItem - &itemcount &newbiblio &newbiblioitem - &modnote &newsubject &newsubtitle - &modbiblio &checkitems - &newitems &modbibitem - &modsubtitle &modsubject &modaddauthor &moditem &countitems - &delitem &deletebiblioitem &delbiblio - &GetItemTypes &getbiblio - &getbiblioitembybiblionumber - &getbiblioitem &getitemsbybiblioitem - &skip - &newcompletebiblioitem - - &MARCfind_oldbiblionumber_from_MARCbibid - &MARCfind_MARCbibid_from_oldbiblionumber - &MARCfind_marc_from_kohafield - &MARCfindsubfield - &MARCgettagslib - - &NEWnewbiblio &NEWnewitem - &NEWmodbiblio &NEWmoditem - &NEWdelbiblio &NEWdelitem - - &MARCaddbiblio &MARCadditem - &MARCmodsubfield &MARCaddsubfield - &MARCmodbiblio &MARCmoditem - &MARCkoha2marcBiblio &MARCmarc2koha - &MARCkoha2marcItem &MARChtml2marc - &MARCgetbiblio &MARCgetitem - &MARCaddword &MARCdelword - &char_decode - ); - -# -# -# MARC MARC MARC MARC MARC MARC MARC MARC MARC MARC MARC MARC MARC MARC MARC MARC MARC MARC MARC -# -# -# all the following subs takes a MARC::Record as parameter and manage -# the MARC-DB. They are called by the 1.0/1.2 xxx subs, and by the -# NEWxxx subs (xxx deals with old-DB parameters, the NEWxxx deals with MARC-DB parameter) - -=head1 NAME - -C4::Biblio - acquisition, catalog management functions - -=head1 SYNOPSIS - -move from 1.2 to 1.4 version : -1.2 and previous version uses a specific API to manage biblios. This API uses old-DB style parameters. -In the 1.4 version, we want to do 2 differents things : - - keep populating the old-DB, that has a LOT less datas than MARC - - populate the MARC-DB -To populate the DBs we have 2 differents sources : - - the standard acquisition system (through book sellers), that does'nt use MARC data - - the MARC acquisition system, that uses MARC data. - -Thus, we have 2 differents cases : -- with the standard acquisition system, we have non MARC data and want to populate old-DB and MARC-DB, knowing it's an incomplete MARC-record -- with the MARC acquisition system, we have MARC datas, and want to loose nothing in MARC-DB. So, we can't store datas in old-DB, then copy in MARC-DB. we MUST have an API for true MARC data, that populate MARC-DB then old-DB - -That's why we need 4 subs : -all I manage only MARC tables. They manage MARC-DB with MARC::Record parameters -all I manage only OLD-DB tables. They manage old-DB with old-DB parameters -all I manage both OLD-DB and MARC tables. They use MARC::Record as parameters. it's the API that MUST be used in MARC acquisition system -all I are the old-style API. They use old-DB as parameter, then call internally the OLD and MARC subs. - -- NEW and old-style API should be used in koha to manage biblio -- MARCsubs are divided in 2 parts : -* some of them manage MARC parameters. They are heavily used in koha. -* some of them manage MARC biblio : they are mostly used by NEW and old-style subs. -- OLD are used internally only - -all subs requires/use $dbh as 1st parameter. - -I - -all subs requires/use $dbh as 1st parameter. -those subs are used by the MARC-compliant version of koha : marc import, or marc management. - -I - -all subs requires/use $dbh as 1st parameter. -those subs are used by the MARC-compliant version of koha : marc import, or marc management. - -They all are the exact copy of 1.0/1.2 version of the sub without the OLD. -The OLDxxx is called by the original xxx sub. -the 1.4 xxx sub also builds MARC::Record an calls the MARCxxx - -WARNING : there is 1 difference between initialxxx and OLDxxx : -the db header $dbh is always passed as parameter to avoid over-DB connexion - -=head1 DESCRIPTION - -=over 4 - -=item @tagslib = &MARCgettagslib($dbh,1|0); - -last param is 1 for liblibrarian and 0 for libopac -returns a hash with tag/subfield meaning -=item ($tagfield,$tagsubfield) = &MARCfind_marc_from_kohafield($dbh,$kohafield); - -finds MARC tag and subfield for a given kohafield -kohafield is "table.field" where table= biblio|biblioitems|items, and field a field of the previous table - -=item $biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$MARCbibi); - -finds a old-db biblio number for a given MARCbibid number - -=item $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$oldbiblionumber); - -finds a MARC bibid from a old-db biblionumber - -=item $MARCRecord = &MARCkoha2marcBiblio($dbh,$biblionumber,biblioitemnumber); - -MARCkoha2marcBiblio is a wrapper between old-DB and MARC-DB. It returns a MARC::Record builded with old-DB biblio/biblioitem - -=item $MARCRecord = &MARCkoha2marcItem($dbh,$biblionumber,itemnumber); - -MARCkoha2marcItem is a wrapper between old-DB and MARC-DB. It returns a MARC::Record builded with old-DB item - -=item $MARCRecord = &MARCkoha2marcSubtitle($dbh,$biblionumber,$subtitle); - -MARCkoha2marcSubtitle is a wrapper between old-DB and MARC-DB. It returns a MARC::Record builded with old-DB subtitle - -=item $olddb = &MARCmarc2koha($dbh,$MARCRecord); - -builds a hash with old-db datas from a MARC::Record - -=item &MARCaddbiblio($dbh,$MARC::Record,$biblionumber); - -creates a biblio (in the MARC tables only). $biblionumber is the old-db biblionumber of the biblio - -=item &MARCaddsubfield($dbh,$bibid,$tagid,$indicator,$tagorder,$subfieldcode,$subfieldorder,$subfieldvalue); - -adds a subfield in a biblio (in the MARC tables only). - -=item $MARCRecord = &MARCgetbiblio($dbh,$bibid); - -Returns a MARC::Record for the biblio $bibid. - -=item &MARCmodbiblio($dbh,$bibid,$record,$delete); - -MARCmodbiblio changes a biblio for a biblio,MARC::Record passed as parameter -It 1st delete the biblio, then recreates it. -WARNING : the $delete parameter is not used anymore (too much unsolvable cases). -=item ($subfieldid,$subfieldvalue) = &MARCmodsubfield($dbh,$subfieldid,$subfieldvalue); - -MARCmodsubfield changes the value of a given subfield - -=item $subfieldid = &MARCfindsubfield($dbh,$bibid,$tag,$subfieldcode,$subfieldorder,$subfieldvalue); - -MARCfindsubfield returns a subfield number given a bibid/tag/subfieldvalue values. -Returns -1 if more than 1 answer - -=item $subfieldid = &MARCfindsubfieldid($dbh,$bibid,$tag,$tagorder,$subfield,$subfieldorder); - -MARCfindsubfieldid find a subfieldid for a bibid/tag/tagorder/subfield/subfieldorder - -=item &MARCdelsubfield($dbh,$bibid,$tag,$tagorder,$subfield,$subfieldorder); - -MARCdelsubfield delete a subfield for a bibid/tag/tagorder/subfield/subfieldorder - -=item &MARCdelbiblio($dbh,$bibid); - -MARCdelbiblio delete biblio $bibid - -=item &MARCkoha2marcOnefield - -used by MARCkoha2marc and should not be useful elsewhere - -=item &MARCmarc2kohaOnefield - -used by MARCmarc2koha and should not be useful elsewhere - -=item MARCaddword - -used to manage MARC_word table and should not be useful elsewhere - -=item MARCdelword - -used to manage MARC_word table and should not be useful elsewhere - -=cut - -sub MARCgettagslib { - my ($dbh,$forlibrarian)= @_; - my $sth; - my $libfield = ($forlibrarian eq 1)? 'liblibrarian' : 'libopac'; - $sth=$dbh->prepare("select tagfield,$libfield as lib,mandatory from marc_tag_structure order by tagfield"); - $sth->execute; - my ($lib,$tag,$res,$tab,$mandatory,$repeatable); - while ( ($tag,$lib,$mandatory) = $sth->fetchrow) { - $res->{$tag}->{lib}=$lib; - $res->{$tab}->{tab}=""; # XXX - $res->{$tag}->{mandatory}=$mandatory; - } - - $sth=$dbh->prepare("select tagfield,tagsubfield,$libfield as lib,tab, mandatory, repeatable,authorised_value,thesaurus_category,value_builder,kohafield from marc_subfield_structure order by tagfield,tagsubfield"); - $sth->execute; - - my $subfield; - my $authorised_value; - my $thesaurus_category; - my $value_builder; - my $kohafield; - while ( ($tag, $subfield, $lib, $tab, $mandatory, $repeatable,$authorised_value,$thesaurus_category,$value_builder,$kohafield) = $sth->fetchrow) { - $res->{$tag}->{$subfield}->{lib}=$lib; - $res->{$tag}->{$subfield}->{tab}=$tab; - $res->{$tag}->{$subfield}->{mandatory}=$mandatory; - $res->{$tag}->{$subfield}->{repeatable}=$repeatable; - $res->{$tag}->{$subfield}->{authorised_value}=$authorised_value; - $res->{$tag}->{$subfield}->{thesaurus_category}=$thesaurus_category; - $res->{$tag}->{$subfield}->{value_builder}=$value_builder; - $res->{$tag}->{$subfield}->{kohafield}=$kohafield; - } - return $res; -} - -sub MARCfind_marc_from_kohafield { - my ($dbh,$kohafield) = @_; - my $sth=$dbh->prepare("select tagfield,tagsubfield from marc_subfield_structure where kohafield=?"); - $sth->execute($kohafield); - my ($tagfield,$tagsubfield) = $sth->fetchrow; - return ($tagfield,$tagsubfield); -} - -sub MARCfind_oldbiblionumber_from_MARCbibid { - my ($dbh,$MARCbibid) = @_; - my $sth=$dbh->prepare("select biblionumber from marc_biblio where bibid=?"); - $sth->execute($MARCbibid); - my ($biblionumber) = $sth->fetchrow; - return $biblionumber; -} - -sub MARCfind_MARCbibid_from_oldbiblionumber { - my ($dbh,$oldbiblionumber) = @_; - my $sth=$dbh->prepare("select bibid from marc_biblio where biblionumber=?"); - $sth->execute($oldbiblionumber); - my ($bibid) = $sth->fetchrow; - return $bibid; -} - -sub MARCaddbiblio { -# pass the MARC::Record to this function, and it will create the records in the marc tables - my ($dbh,$record,$biblionumber,$bibid) = @_; - my @fields=$record->fields(); -# warn "IN MARCaddbiblio $bibid => ".$record->as_formatted; -# my $bibid; -# adding main table, and retrieving bibid -# if bibid is sent, then it's not a true add, it's only a re-add, after a delete (ie, a mod) -# if bibid empty => true add, find a new bibid number - unless ($bibid) { - $dbh->do("lock tables marc_biblio WRITE,marc_subfield_table WRITE, marc_word WRITE, marc_blob_subfield WRITE, stopwords READ"); - my $sth=$dbh->prepare("insert into marc_biblio (datecreated,biblionumber) values (now(),?)"); - $sth->execute($biblionumber); - $sth=$dbh->prepare("select max(bibid) from marc_biblio"); - $sth->execute; - ($bibid)=$sth->fetchrow; - $sth->finish; - } - my $fieldcount=0; - # now, add subfields... - foreach my $field (@fields) { - $fieldcount++; - if ($field->tag() <10) { - &MARCaddsubfield($dbh,$bibid, - $field->tag(), - '', - $fieldcount, - '', - 1, - $field->data() - ); - } else { - my @subfields=$field->subfields(); - foreach my $subfieldcount (0..$#subfields) { - &MARCaddsubfield($dbh,$bibid, - $field->tag(), - $field->indicator(1).$field->indicator(2), - $fieldcount, - $subfields[$subfieldcount][0], - $subfieldcount+1, - $subfields[$subfieldcount][1] - ); - } - } - } - $dbh->do("unlock tables"); - return $bibid; -} - -sub MARCadditem { -# pass the MARC::Record to this function, and it will create the records in the marc tables - my ($dbh,$record,$biblionumber) = @_; -# warn "adding : ".$record->as_formatted(); -# search for MARC biblionumber - $dbh->do("lock tables marc_biblio WRITE,marc_subfield_table WRITE, marc_word WRITE, marc_blob_subfield WRITE, stopwords READ"); - my $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber); - my @fields=$record->fields(); - my $sth = $dbh->prepare("select max(tagorder) from marc_subfield_table where bibid=?"); - $sth->execute($bibid); - my ($fieldcount) = $sth->fetchrow; - # now, add subfields... - foreach my $field (@fields) { - my @subfields=$field->subfields(); - $fieldcount++; - foreach my $subfieldcount (0..$#subfields) { - &MARCaddsubfield($dbh,$bibid, - $field->tag(), - $field->indicator(1).$field->indicator(2), - $fieldcount, - $subfields[$subfieldcount][0], - $subfieldcount+1, - $subfields[$subfieldcount][1] - ); - } - } - $dbh->do("unlock tables"); - return $bibid; -} - -sub MARCaddsubfield { -# Add a new subfield to a tag into the DB. - my ($dbh,$bibid,$tagid,$tag_indicator,$tagorder,$subfieldcode,$subfieldorder,$subfieldvalues) = @_; - # if not value, end of job, we do nothing - if (length($subfieldvalues) ==0) { - return; - } - if (not($subfieldcode)) { - $subfieldcode=' '; - } - my @subfieldvalues = split /\|/,$subfieldvalues; - foreach my $subfieldvalue (@subfieldvalues) { - if (length($subfieldvalue)>255) { - $dbh->do("lock tables marc_blob_subfield WRITE, marc_subfield_table WRITE"); - my $sth=$dbh->prepare("insert into marc_blob_subfield (subfieldvalue) values (?)"); - $sth->execute($subfieldvalue); - $sth=$dbh->prepare("select max(blobidlink)from marc_blob_subfield"); - $sth->execute; - my ($res)=$sth->fetchrow; - $sth=$dbh->prepare("insert into marc_subfield_table (bibid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,valuebloblink) values (?,?,?,?,?,?,?)"); - $sth->execute($bibid,(sprintf "%03s",$tagid),$tagorder,$tag_indicator,$subfieldcode,$subfieldorder,$res); - if ($sth->errstr) { - warn "ERROR ==> insert into marc_subfield_table (bibid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue) values ($bibid,$tagid,$tagorder,$tag_indicator,$subfieldcode,$subfieldorder,$subfieldvalue)\n"; - } - $dbh->do("unlock tables"); - } else { - my $sth=$dbh->prepare("insert into marc_subfield_table (bibid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue) values (?,?,?,?,?,?,?)"); - $sth->execute($bibid,(sprintf "%03s",$tagid),$tagorder,$tag_indicator,$subfieldcode,$subfieldorder,$subfieldvalue); - if ($sth->errstr) { - warn "ERROR ==> insert into marc_subfield_table (bibid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue) values ($bibid,$tagid,$tagorder,$tag_indicator,$subfieldcode,$subfieldorder,$subfieldvalue)\n"; - } - } - &MARCaddword($dbh,$bibid,$tagid,$tagorder,$subfieldcode,$subfieldorder,$subfieldvalue); - } -} - -sub MARCgetbiblio { -# Returns MARC::Record of the biblio passed in parameter. - my ($dbh,$bibid)=@_; - my $record = MARC::Record->new(); -#---- TODO : the leader is missing - $record->leader(' '); - my $sth=$dbh->prepare("select bibid,subfieldid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue,valuebloblink - from marc_subfield_table - where bibid=? order by tag,tagorder,subfieldcode - "); - my $sth2=$dbh->prepare("select subfieldvalue from marc_blob_subfield where blobidlink=?"); - $sth->execute($bibid); - my $prevtagorder=1; - my $prevtag='XXX'; - my $previndicator; - my $field; # for >=10 tags - my $prevvalue; # for <10 tags - while (my $row=$sth->fetchrow_hashref) { - if ($row->{'valuebloblink'}) { #---- search blob if there is one - $sth2->execute($row->{'valuebloblink'}); - my $row2=$sth2->fetchrow_hashref; - $sth2->finish; - $row->{'subfieldvalue'}=$row2->{'subfieldvalue'}; - } - if ($row->{tagorder} ne $prevtagorder || $row->{tag} ne $prevtag) { - $previndicator.=" "; - if ($prevtag <10) { - $record->add_fields((sprintf "%03s",$prevtag),$prevvalue) unless $prevtag eq "XXX"; # ignore the 1st loop - } else { - $record->add_fields($field) unless $prevtag eq "XXX"; - } - undef $field; - $prevtagorder=$row->{tagorder}; - $prevtag = $row->{tag}; - $previndicator=$row->{tag_indicator}; - if ($row->{tag}<10) { - $prevvalue = $row->{subfieldvalue}; - } else { - $field = MARC::Field->new((sprintf "%03s",$prevtag), substr($row->{tag_indicator}.' ',0,1), substr($row->{tag_indicator}.' ',1,1), $row->{'subfieldcode'}, $row->{'subfieldvalue'} ); - } - } else { - if ($row->{tag} <10) { - $record->add_fields((sprintf "%03s",$row->{tag}), $row->{'subfieldvalue'}); - } else { - $field->add_subfields($row->{'subfieldcode'}, $row->{'subfieldvalue'} ); - } - $prevtag= $row->{tag}; - $previndicator=$row->{tag_indicator}; - } - } - # the last has not been included inside the loop... do it now ! - if ($prevtag ne "XXX") { # check that we have found something. Otherwise, prevtag is still XXX and we - # must return an empty record, not make MARC::Record fail because we try to - # create a record with XXX as field :-( - if ($prevtag <10) { - $record->add_fields($prevtag,$prevvalue); - } else { - # my $field = MARC::Field->new( $prevtag, "", "", %subfieldlist); - $record->add_fields($field); - } - } - return $record; -} -sub MARCgetitem { -# Returns MARC::Record of the biblio passed in parameter. - my ($dbh,$bibid,$itemnumber)=@_; - my $record = MARC::Record->new(); -# search MARC tagorder - my $sth2 = $dbh->prepare("select tagorder from marc_subfield_table,marc_subfield_structure where marc_subfield_table.tag=marc_subfield_structure.tagfield and marc_subfield_table.subfieldcode=marc_subfield_structure.tagsubfield and bibid=? and kohafield='items.itemnumber' and subfieldvalue=?"); - $sth2->execute($bibid,$itemnumber); - my ($tagorder) = $sth2->fetchrow_array(); -#---- TODO : the leader is missing - my $sth=$dbh->prepare("select bibid,subfieldid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue,valuebloblink - from marc_subfield_table - where bibid=? and tagorder=? order by subfieldcode,subfieldorder - "); - $sth2=$dbh->prepare("select subfieldvalue from marc_blob_subfield where blobidlink=?"); - $sth->execute($bibid,$tagorder); - while (my $row=$sth->fetchrow_hashref) { - if ($row->{'valuebloblink'}) { #---- search blob if there is one - $sth2->execute($row->{'valuebloblink'}); - my $row2=$sth2->fetchrow_hashref; - $sth2->finish; - $row->{'subfieldvalue'}=$row2->{'subfieldvalue'}; - } - if ($record->field($row->{'tag'})) { - my $field; -#--- this test must stay as this, because of strange behaviour of mySQL/Perl DBI with char var containing a number... -#--- sometimes, eliminates 0 at beginning, sometimes no ;-\\\ - if (length($row->{'tag'}) <3) { - $row->{'tag'} = "0".$row->{'tag'}; - } - $field =$record->field($row->{'tag'}); - if ($field) { - my $x = $field->add_subfields($row->{'subfieldcode'},$row->{'subfieldvalue'}); - $record->delete_field($field); - $record->add_fields($field); - } - } else { - if (length($row->{'tag'}) < 3) { - $row->{'tag'} = "0".$row->{'tag'}; - } - my $temp = MARC::Field->new($row->{'tag'}," "," ", $row->{'subfieldcode'} => $row->{'subfieldvalue'}); - $record->add_fields($temp); - } - - } - return $record; -} - -sub MARCmodbiblio { - my ($dbh,$bibid,$record,$delete)=@_; - my $oldrecord=&MARCgetbiblio($dbh,$bibid); - if ($oldrecord eq $record) { - return; - } -# 1st delete the biblio, -# 2nd recreate it - my $biblionumber = MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid); - &MARCdelbiblio($dbh,$bibid,1); - &MARCaddbiblio($dbh,$record,$biblionumber,$bibid); -} - -sub MARCdelbiblio { - my ($dbh,$bibid,$keep_items) = @_; -# if the keep_item is set to 1, then all items are preserved. -# This flag is set when the delbiblio is called by modbiblio -# due to a too complex structure of MARC (repeatable fields and subfields), -# the best solution for a modif is to delete / recreate the record. - -# 1st of all, copy the MARC::Record to deletedbiblio table => if a true deletion, MARC data will be kept. -# if deletion called before MARCmodbiblio => won't do anything, as the oldbiblionumber doesn't -# exist in deletedbiblio table - my $record = MARCgetbiblio($dbh,$bibid); - my $oldbiblionumber = MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid); - my $copy2deleted=$dbh->prepare("update deletedbiblio set marc=? where biblionumber=?"); - $copy2deleted->execute($record->as_usmarc(),$oldbiblionumber); -# now, delete in MARC tables. - if ($keep_items eq 1) { - #search item field code - my $sth = $dbh->prepare("select tagfield from marc_subfield_structure where kohafield like 'items.%'"); - $sth->execute; - my $itemtag = $sth->fetchrow_hashref->{tagfield}; - $dbh->do("delete from marc_subfield_table where bibid=$bibid and tag<>$itemtag"); - $dbh->do("delete from marc_word where bibid=$bibid and tag<>$itemtag"); - } else { - $dbh->do("delete from marc_biblio where bibid=$bibid"); - $dbh->do("delete from marc_subfield_table where bibid=$bibid"); - $dbh->do("delete from marc_word where bibid=$bibid"); - } -} - -sub MARCdelitem { -# delete the item passed in parameter in MARC tables. - my ($dbh,$bibid,$itemnumber)=@_; - # my $record = MARC::Record->new(); - # search MARC tagorder - my $record = MARCgetitem($dbh,$bibid,$itemnumber); - my $copy2deleted=$dbh->prepare("update deleteditems set marc=? where itemnumber=?"); - $copy2deleted->execute($record->as_usmarc(),$itemnumber); - - my $sth2 = $dbh->prepare("select tagorder from marc_subfield_table,marc_subfield_structure where marc_subfield_table.tag=marc_subfield_structure.tagfield and marc_subfield_table.subfieldcode=marc_subfield_structure.tagsubfield and bibid=? and kohafield='items.itemnumber' and subfieldvalue=?"); - $sth2->execute($bibid,$itemnumber); - my ($tagorder) = $sth2->fetchrow_array(); - my $sth=$dbh->prepare("delete from marc_subfield_table where bibid=? and tagorder=?"); - $sth->execute($bibid,$tagorder); -} - -sub MARCmoditem { - my ($dbh,$record,$bibid,$itemnumber,$delete)=@_; - my $oldrecord=&MARCgetitem($dbh,$bibid,$itemnumber); - # if nothing to change, don't waste time... - if ($oldrecord eq $record) { - return; - } - # otherwise, skip through each subfield... - my @fields = $record->fields(); - # search old MARC item - my $sth2 = $dbh->prepare("select tagorder from marc_subfield_table,marc_subfield_structure where marc_subfield_table.tag=marc_subfield_structure.tagfield and marc_subfield_table.subfieldcode=marc_subfield_structure.tagsubfield and bibid=? and kohafield='items.itemnumber' and subfieldvalue=?"); - $sth2->execute($bibid,$itemnumber); - my ($tagorder) = $sth2->fetchrow_array(); - foreach my $field (@fields) { - my $oldfield = $oldrecord->field($field->tag()); - my @subfields=$field->subfields(); - my $subfieldorder=0; - foreach my $subfield (@subfields) { - $subfieldorder++; -# warn "compare : $oldfield".$oldfield->subfield(@$subfield[0]); - if ($oldfield eq 0 or (length($oldfield->subfield(@$subfield[0])) ==0) ) { - # just adding datas... -# warn "addfield : / $subfieldorder / @$subfield[0] - @$subfield[1]"; -# warn "NEW subfield : $bibid,".$field->tag().",".$tagorder.",".@$subfield[0].",".$subfieldorder.",".@$subfield[1].")"; - &MARCaddsubfield($dbh,$bibid,$field->tag(),$field->indicator(1).$field->indicator(2), - $tagorder,@$subfield[0],$subfieldorder,@$subfield[1]); - } else { -# warn "modfield : / $subfieldorder / @$subfield[0] - @$subfield[1]"; - # modify he subfield if it's a different string - if ($oldfield->subfield(@$subfield[0]) ne @$subfield[1] ) { - my $subfieldid=&MARCfindsubfieldid($dbh,$bibid,$field->tag(),$tagorder,@$subfield[0],$subfieldorder); -# warn "changing : $subfieldid, $bibid,".$field->tag(),",$tagorder,@$subfield[0],@$subfield[1],$subfieldorder"; - &MARCmodsubfield($dbh,$subfieldid,@$subfield[1]); - } - } - } - } -} - - -sub MARCmodsubfield { -# Subroutine changes a subfield value given a subfieldid. - my ($dbh, $subfieldid, $subfieldvalue )=@_; - $dbh->do("lock tables marc_blob_subfield WRITE,marc_subfield_table WRITE"); - my $sth1=$dbh->prepare("select valuebloblink from marc_subfield_table where subfieldid=?"); - $sth1->execute($subfieldid); - my ($oldvaluebloblink)=$sth1->fetchrow; - $sth1->finish; - my $sth; - # if too long, use a bloblink - if (length($subfieldvalue)>255 ) { - # if already a bloblink, update it, otherwise, insert a new one. - if ($oldvaluebloblink) { - $sth=$dbh->prepare("update marc_blob_subfield set subfieldvalue=? where blobidlink=?"); - $sth->execute($subfieldvalue,$oldvaluebloblink); - } else { - $sth=$dbh->prepare("insert into marc_blob_subfield (subfieldvalue) values (?)"); - $sth->execute($subfieldvalue); - $sth=$dbh->prepare("select max(blobidlink) from marc_blob_subfield"); - $sth->execute; - my ($res)=$sth->fetchrow; - $sth=$dbh->prepare("update marc_subfield_table set subfieldvalue=null, valuebloblink=? where subfieldid=?"); - $sth->execute($res,$subfieldid); - } - } else { - # note this can leave orphan bloblink. Not a big problem, but we should build somewhere a orphan deleting script... - $sth=$dbh->prepare("update marc_subfield_table set subfieldvalue=?,valuebloblink=null where subfieldid=?"); - $sth->execute($subfieldvalue, $subfieldid); - } - $dbh->do("unlock tables"); - $sth->finish; - $sth=$dbh->prepare("select bibid,tag,tagorder,subfieldcode,subfieldid,subfieldorder from marc_subfield_table where subfieldid=?"); - $sth->execute($subfieldid); - my ($bibid,$tagid,$tagorder,$subfieldcode,$x,$subfieldorder) = $sth->fetchrow; - $subfieldid=$x; - &MARCdelword($dbh,$bibid,$tagid,$tagorder,$subfieldcode,$subfieldorder); - &MARCaddword($dbh,$bibid,$tagid,$tagorder,$subfieldcode,$subfieldorder,$subfieldvalue); - return($subfieldid, $subfieldvalue); -} - -sub MARCfindsubfield { - my ($dbh,$bibid,$tag,$subfieldcode,$subfieldorder,$subfieldvalue) = @_; - my $resultcounter=0; - my $subfieldid; - my $lastsubfieldid; - my $query="select subfieldid from marc_subfield_table where bibid=? and tag=? and subfieldcode=?"; - my @bind_values = ($bibid,$tag, $subfieldcode); - if ($subfieldvalue) { - $query .= " and subfieldvalue=?"; - push(@bind_values,$subfieldvalue); - } else { - if ($subfieldorder<1) { - $subfieldorder=1; - } - $query .= " and subfieldorder=?"; - push(@bind_values,$subfieldorder); - } - my $sti=$dbh->prepare($query); - $sti->execute(@bind_values); - while (($subfieldid) = $sti->fetchrow) { - $resultcounter++; - $lastsubfieldid=$subfieldid; - } - if ($resultcounter>1) { - # Error condition. Values given did not resolve into a unique record. Don't know what to edit - # should rarely occur (only if we use subfieldvalue with a value that exists twice, which is strange) - return -1; - } else { - return $lastsubfieldid; - } -} - -sub MARCfindsubfieldid { - my ($dbh,$bibid,$tag,$tagorder,$subfield,$subfieldorder) = @_; - my $sth=$dbh->prepare("select subfieldid from marc_subfield_table - where bibid=? and tag=? and tagorder=? - and subfieldcode=? and subfieldorder=?"); - $sth->execute($bibid,$tag,$tagorder,$subfield,$subfieldorder); - my ($res) = $sth->fetchrow; - unless ($res) { - $sth=$dbh->prepare("select subfieldid from marc_subfield_table - where bibid=? and tag=? and tagorder=? - and subfieldcode=?"); - $sth->execute($bibid,$tag,$tagorder,$subfield); - ($res) = $sth->fetchrow; - } - return $res; -} - -sub MARCdelsubfield { -# delete a subfield for $bibid / tag / tagorder / subfield / subfieldorder - my ($dbh,$bibid,$tag,$tagorder,$subfield,$subfieldorder) = @_; - $dbh->do("delete from marc_subfield_table where bibid='$bibid' and - tag='$tag' and tagorder='$tagorder' - and subfieldcode='$subfield' and subfieldorder='$subfieldorder' - "); -} - -sub MARCkoha2marcBiblio { -# this function builds partial MARC::Record from the old koha-DB fields - my ($dbh,$biblionumber,$biblioitemnumber) = @_; - my $sth=$dbh->prepare("select tagfield,tagsubfield from marc_subfield_structure where kohafield=?"); - my $record = MARC::Record->new(); -#--- if bibid, then retrieve old-style koha data - if ($biblionumber>0) { - my $sth2=$dbh->prepare("select biblionumber,author,title,unititle,notes,abstract,serial,seriestitle,copyrightdate,timestamp - from biblio where biblionumber=?"); - $sth2->execute($biblionumber); - my $row=$sth2->fetchrow_hashref; - my $code; - foreach $code (keys %$row) { - if ($row->{$code}) { - &MARCkoha2marcOnefield($sth,$record,"biblio.".$code,$row->{$code}); - } - } - } -#--- if biblioitem, then retrieve old-style koha data - if ($biblioitemnumber>0) { - my $sth2=$dbh->prepare(" SELECT biblioitemnumber,biblionumber,volume,number,classification, - itemtype,url,isbn,issn,dewey,subclass,publicationyear,publishercode, - volumedate,volumeddesc,timestamp,illus,pages,notes AS bnotes,size,place - FROM biblioitems - WHERE biblioitemnumber=? - "); - $sth2->execute($biblioitemnumber); - my $row=$sth2->fetchrow_hashref; - my $code; - foreach $code (keys %$row) { - if ($row->{$code}) { - &MARCkoha2marcOnefield($sth,$record,"biblioitems.".$code,$row->{$code}); - } - } - } - # other fields => additional authors, subjects, subtitles - my $sth2=$dbh->prepare(" SELECT author FROM additionalauthors WHERE biblionumber=?"); - $sth2->execute($biblionumber); - while (my $row=$sth2->fetchrow_hashref) { - &MARCkoha2marcOnefield($sth,$record,"additionalauthors.author",$row->{'author'}); - } - my $sth2=$dbh->prepare(" SELECT subject FROM bibliosubject WHERE biblionumber=?"); - $sth2->execute($biblionumber); - while (my $row=$sth2->fetchrow_hashref) { - &MARCkoha2marcOnefield($sth,$record,"bibliosubject.subject",$row->{'subject'}); - } - my $sth2=$dbh->prepare(" SELECT subtitle FROM bibliosubtitle WHERE biblionumber=?"); - $sth2->execute($biblionumber); - while (my $row=$sth2->fetchrow_hashref) { - &MARCkoha2marcOnefield($sth,$record,"bibliosubtitle.title",$row->{'subtitle'}); - } - return $record; -} - -sub MARCkoha2marcItem { -# this function builds partial MARC::Record from the old koha-DB fields - my ($dbh,$biblionumber,$itemnumber) = @_; -# my $dbh=&C4Connect; - my $sth=$dbh->prepare("select tagfield,tagsubfield from marc_subfield_structure where kohafield=?"); - my $record = MARC::Record->new(); -#--- if item, then retrieve old-style koha data - if ($itemnumber>0) { -# print STDERR "prepare $biblionumber,$itemnumber\n"; - my $sth2=$dbh->prepare("SELECT itemnumber,biblionumber,multivolumepart,biblioitemnumber,barcode,dateaccessioned, - booksellerid,homebranch,price,replacementprice,replacementpricedate,datelastborrowed, - datelastseen,multivolume,stack,notforloan,itemlost,wthdrawn,bulk,issues,renewals, - reserves,restricted,binding,itemnotes,holdingbranch,timestamp - FROM items - WHERE itemnumber=?"); - $sth2->execute($itemnumber); - my $row=$sth2->fetchrow_hashref; - my $code; - foreach $code (keys %$row) { - if ($row->{$code}) { - &MARCkoha2marcOnefield($sth,$record,"items.".$code,$row->{$code}); - } - } - } - return $record; -} - -sub MARCkoha2marcSubtitle { -# this function builds partial MARC::Record from the old koha-DB fields - my ($dbh,$bibnum,$subtitle) = @_; - my $sth=$dbh->prepare("select tagfield,tagsubfield from marc_subfield_structure where kohafield=?"); - my $record = MARC::Record->new(); - &MARCkoha2marcOnefield($sth,$record,"bibliosubtitle.subtitle",$subtitle); - return $record; -} - -sub MARCkoha2marcOnefield { - my ($sth,$record,$kohafieldname,$value)=@_; - my $tagfield; - my $tagsubfield; - $sth->execute($kohafieldname); - if (($tagfield,$tagsubfield)=$sth->fetchrow) { - if ($record->field($tagfield)) { - my $tag =$record->field($tagfield); - if ($tag) { - $tag->add_subfields($tagsubfield,$value); - $record->delete_field($tag); - $record->add_fields($tag); - } - } else { - $record->add_fields($tagfield," "," ",$tagsubfield => $value); - } - } - return $record; -} - -sub MARChtml2marc { - my ($dbh,$rtags,$rsubfields,$rvalues,%indicators) = @_; - my $prevtag = -1; - my $record = MARC::Record->new(); -# my %subfieldlist=(); - my $prevvalue; # if tag <10 - my $field; # if tag >=10 - for (my $i=0; $i< @$rtags; $i++) { - # rebuild MARC::Record - if (@$rtags[$i] ne $prevtag) { - if ($prevtag < 10) { - if ($prevvalue) { - $record->add_fields((sprintf "%03s",$prevtag),$prevvalue); - } - } else { - if ($field) { - $record->add_fields($field); - } - } - $indicators{@$rtags[$i]}.=' '; - if (@$rtags[$i] <10) { - $prevvalue= @$rvalues[$i]; - } else { - $field = MARC::Field->new( (sprintf "%03s",@$rtags[$i]), substr($indicators{@$rtags[$i]},0,1),substr($indicators{@$rtags[$i]},1,1), @$rsubfields[$i] => @$rvalues[$i]); - } - $prevtag = @$rtags[$i]; - } else { - if (@$rtags[$i] <10) { - $prevvalue=@$rvalues[$i]; - } else { - if (@$rvalues[$i]) { - $field->add_subfields(@$rsubfields[$i] => @$rvalues[$i]); - } - } - $prevtag= @$rtags[$i]; - } - } - # the last has not been included inside the loop... do it now ! - $record->add_fields($field); -# warn $record->as_formatted; - return $record; -} - -sub MARCmarc2koha { - my ($dbh,$record) = @_; - my $sth=$dbh->prepare("select tagfield,tagsubfield from marc_subfield_structure where kohafield=?"); - my $result; - my $sth2=$dbh->prepare("SHOW COLUMNS from biblio"); - $sth2->execute; - my $field; - # print STDERR $record->as_formatted; - while (($field)=$sth2->fetchrow) { - $result=&MARCmarc2kohaOneField($sth,"biblio",$field,$record,$result); - } - $sth2=$dbh->prepare("SHOW COLUMNS from biblioitems"); - $sth2->execute; - while (($field)=$sth2->fetchrow) { - if ($field eq 'notes') { $field = 'bnotes'; } - $result=&MARCmarc2kohaOneField($sth,"biblioitems",$field,$record,$result); - } - $sth2=$dbh->prepare("SHOW COLUMNS from items"); - $sth2->execute; - while (($field)=$sth2->fetchrow) { - $result = &MARCmarc2kohaOneField($sth,"items",$field,$record,$result); - } - # additional authors : specific - $result = &MARCmarc2kohaOneField($sth,"bibliosubtitle","subtitle",$record,$result); - $result = &MARCmarc2kohaOneField($sth,"additionalauthors","additionalauthors",$record,$result); -# modify copyrightdate to keep only the 1st year found - my $temp = $result->{'copyrightdate'}; - $temp =~ m/c(\d\d\d\d)/; # search cYYYY first - if ($1>0) { - $result->{'copyrightdate'} = $1; - } else { # if no cYYYY, get the 1st date. - $temp =~ m/(\d\d\d\d)/; - $result->{'copyrightdate'} = $1; - } -# modify publicationyear to keep only the 1st year found - my $temp = $result->{'publicationyear'}; - $temp =~ m/c(\d\d\d\d)/; # search cYYYY first - if ($1>0) { - $result->{'publicationyear'} = $1; - } else { # if no cYYYY, get the 1st date. - $temp =~ m/(\d\d\d\d)/; - $result->{'publicationyear'} = $1; - } - return $result; -} - -sub MARCmarc2kohaOneField { -# FIXME ? if a field has a repeatable subfield that is used in old-db, only the 1st will be retrieved... - my ($sth,$kohatable,$kohafield,$record,$result)= @_; -# warn "kohatable / $kohafield / $result / "; - my $res=""; - my $tagfield; - my $subfield; - $sth->execute($kohatable.".".$kohafield); - ($tagfield,$subfield) = $sth->fetchrow; - foreach my $field ($record->field($tagfield)) { - if ($field->subfield($subfield)) { - if ($result->{$kohafield}) { - $result->{$kohafield} .= " | ".$field->subfield($subfield); - } else { - $result->{$kohafield}=$field->subfield($subfield); - } - } - } - return $result; -} - -sub MARCaddword { -# split a subfield string and adds it into the word table. -# removes stopwords - my ($dbh,$bibid,$tag,$tagorder,$subfieldid,$subfieldorder,$sentence) =@_; - $sentence =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\})/ /g; - my @words = split / /,$sentence; - my $stopwords= C4::Context->stopwords; - my $sth=$dbh->prepare("insert into marc_word (bibid, tag, tagorder, subfieldid, subfieldorder, word, sndx_word) - values (?,?,?,?,?,?,soundex(?))"); - foreach my $word (@words) { -# we record only words longer than 2 car and not in stopwords hash - if (length($word)>2 and !($stopwords->{uc($word)})) { - $sth->execute($bibid,$tag,$tagorder,$subfieldid,$subfieldorder,$word,$word); - if ($sth->err()) { - warn "ERROR ==> insert into marc_word (bibid, tag, tagorder, subfieldid, subfieldorder, word, sndx_word) values ($bibid,$tag,$tagorder,$subfieldid,$subfieldorder,$word,soundex($word))\n"; - } - } - } -} - -sub MARCdelword { -# delete words. this sub deletes all the words from a sentence. a subfield modif is done by a delete then a add - my ($dbh,$bibid,$tag,$tagorder,$subfield,$subfieldorder) = @_; - my $sth=$dbh->prepare("delete from marc_word where bibid=? and tag=? and tagorder=? and subfieldid=? and subfieldorder=?"); - $sth->execute($bibid,$tag,$tagorder,$subfield,$subfieldorder); -} - -# -# -# NEW NEW NEW NEW NEW NEW NEW NEW NEW NEW NEW NEW NEW NEW NEW NEW NEW NEW -# -# -# all the following subs are useful to manage MARC-DB with complete MARC records. -# it's used with marcimport, and marc management tools -# - - -=item ($bibid,$oldbibnum,$oldbibitemnum) = NEWnewbibilio($dbh,$MARCRecord,$oldbiblio,$oldbiblioitem); - -creates a new biblio from a MARC::Record. The 3rd and 4th parameter are hashes and may be ignored. If only 2 params are passed to the sub, the old-db hashes -are builded from the MARC::Record. If they are passed, they are used. - -=item NEWnewitem($dbh, $record,$bibid); - -adds an item in the db. - -=cut - -sub NEWnewbiblio { - my ($dbh, $record, $oldbiblio, $oldbiblioitem) = @_; - # note $oldbiblio and $oldbiblioitem are not mandatory. - # if not present, they will be builded from $record with MARCmarc2koha function - if (($oldbiblio) and not($oldbiblioitem)) { - print STDERR "NEWnewbiblio : missing parameter\n"; - print "NEWnewbiblio : missing parameter : contact koha development team\n"; - die; - } - my $oldbibnum; - my $oldbibitemnum; - if ($oldbiblio) { - $oldbibnum = OLDnewbiblio($dbh,$oldbiblio); - $oldbiblioitem->{'biblionumber'} = $oldbibnum; - $oldbibitemnum = OLDnewbiblioitem($dbh,$oldbiblioitem); - } else { - my $olddata = MARCmarc2koha($dbh,$record); - $oldbibnum = OLDnewbiblio($dbh,$olddata); - $olddata->{'biblionumber'} = $oldbibnum; - $oldbibitemnum = OLDnewbiblioitem($dbh,$olddata); - } - # search subtiles, addiauthors and subjects - my ($tagfield,$tagsubfield) = MARCfind_marc_from_kohafield($dbh,"additionalauthors.author"); - my @addiauthfields = $record->field($tagfield); - foreach my $addiauthfield (@addiauthfields) { - my @addiauthsubfields = $addiauthfield->subfield($tagsubfield); - foreach my $subfieldcount (0..$#addiauthsubfields) { - OLDmodaddauthor($dbh,$oldbibnum,$addiauthsubfields[$subfieldcount]); - } - } - ($tagfield,$tagsubfield) = MARCfind_marc_from_kohafield($dbh,"bibliosubtitle.title"); - my @subtitlefields = $record->field($tagfield); - foreach my $subtitlefield (@subtitlefields) { - my @subtitlesubfields = $subtitlefield->subfield($tagsubfield); - foreach my $subfieldcount (0..$#subtitlesubfields) { - OLDnewsubtitle($dbh,$oldbibnum,$subtitlesubfields[$subfieldcount]); - } - } - ($tagfield,$tagsubfield) = MARCfind_marc_from_kohafield($dbh,"bibliosubject.subject"); - my @subj = $record->field($tagfield); - my @subjects; - foreach my $subject (@subj) { - my @subjsubfield = $subject->subfield($tagsubfield); - foreach my $subfieldcount (0..$#subjsubfield) { - push @subjects,$subjsubfield[$subfieldcount]; - } - } - OLDmodsubject($dbh,$oldbibnum,1,@subjects); - # we must add bibnum and bibitemnum in MARC::Record... - # we build the new field with biblionumber and biblioitemnumber - # we drop the original field - # we add the new builded field. - # NOTE : Works only if the field is ONLY for biblionumber and biblioitemnumber - # (steve and paul : thinks 090 is a good choice) - my $sth=$dbh->prepare("select tagfield,tagsubfield from marc_subfield_structure where kohafield=?"); - $sth->execute("biblio.biblionumber"); - (my $tagfield1, my $tagsubfield1) = $sth->fetchrow; - $sth->execute("biblioitems.biblioitemnumber"); - (my $tagfield2, my $tagsubfield2) = $sth->fetchrow; - if ($tagfield1 != $tagfield2) { - warn "Error in NEWnewbiblio : biblio.biblionumber and biblioitems.biblioitemnumber MUST have the same field number"; - print "Content-Type: text/html\n\nError in NEWnewbiblio : biblio.biblionumber and biblioitems.biblioitemnumber MUST have the same field number"; - die; - } - my $newfield = MARC::Field->new( $tagfield1,'','', - "$tagsubfield1" => $oldbibnum, - "$tagsubfield2" => $oldbibitemnum); - # drop old field and create new one... - my $old_field = $record->field($tagfield1); - $record->delete_field($old_field); - $record->add_fields($newfield); - my $bibid = MARCaddbiblio($dbh,$record,$oldbibnum); - return ($bibid,$oldbibnum,$oldbibitemnum ); -} - -sub NEWmodbiblio { - my ($dbh,$record,$bibid) =@_; - &MARCmodbiblio($dbh,$bibid,$record,0); - my $oldbiblio = MARCmarc2koha($dbh,$record); - my $oldbiblionumber = OLDmodbiblio($dbh,$oldbiblio); - OLDmodbibitem($dbh,$oldbiblio); - # now, modify addi authors, subject, addititles. - my ($tagfield,$tagsubfield) = MARCfind_marc_from_kohafield($dbh,"additionalauthors.author"); - my @addiauthfields = $record->field($tagfield); - foreach my $addiauthfield (@addiauthfields) { - my @addiauthsubfields = $addiauthfield->subfield($tagsubfield); - foreach my $subfieldcount (0..$#addiauthsubfields) { - OLDmodaddauthor($dbh,$oldbiblionumber,$addiauthsubfields[$subfieldcount]); - } - } - ($tagfield,$tagsubfield) = MARCfind_marc_from_kohafield($dbh,"bibliosubtitle.subtitle"); - my @subtitlefields = $record->field($tagfield); - foreach my $subtitlefield (@subtitlefields) { - my @subtitlesubfields = $subtitlefield->subfield($tagsubfield); - foreach my $subfieldcount (0..$#subtitlesubfields) { - OLDmodsubtitle($dbh,$oldbiblionumber,$subtitlesubfields[$subfieldcount]); - } - } - ($tagfield,$tagsubfield) = MARCfind_marc_from_kohafield($dbh,"bibliosubject.subject"); - my @subj = $record->field($tagfield); - my @subjects; - foreach my $subject (@subj) { - my @subjsubfield = $subject->subfield($tagsubfield); - foreach my $subfieldcount (0..$#subjsubfield) { - push @subjects,$subjsubfield[$subfieldcount]; - } - } - OLDmodsubject($dbh,$oldbiblionumber,1,@subjects); - return 1; -} - -sub NEWdelbiblio { - my ($dbh,$bibid)=@_; - my $biblio = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid); - &OLDdelbiblio($dbh,$biblio); - my $sth = $dbh->prepare("select biblioitemnumber from biblioitems where biblionumber=?"); - $sth->execute($biblio); - while(my ($biblioitemnumber) = $sth->fetchrow) { - OLDdeletebiblioitem($dbh,$biblioitemnumber); - } - &MARCdelbiblio($dbh,$bibid,0); -} - - -sub NEWnewitem { - my ($dbh, $record,$bibid) = @_; - # add item in old-DB - my $item = &MARCmarc2koha($dbh,$record); - # needs old biblionumber and biblioitemnumber - $item->{'biblionumber'} = MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid); - my $sth = $dbh->prepare("select biblioitemnumber from biblioitems where biblionumber=?"); - $sth->execute($item->{'biblionumber'}); - ($item->{'biblioitemnumber'}) = $sth->fetchrow; - my ($itemnumber,$error) = &OLDnewitems($dbh,$item,$item->{barcode}); - # add itemnumber to MARC::Record before adding the item. - my $sth=$dbh->prepare("select tagfield,tagsubfield from marc_subfield_structure where kohafield=?"); - &MARCkoha2marcOnefield($sth,$record,"items.itemnumber",$itemnumber); - # add the item - my $bib = &MARCadditem($dbh,$record,$item->{'biblionumber'}); -} - -sub NEWmoditem { - my ($dbh,$record,$bibid,$itemnumber,$delete) = @_; - &MARCmoditem($dbh,$record,$bibid,$itemnumber,$delete); - my $olditem = MARCmarc2koha($dbh,$record); - OLDmoditem($dbh,$olditem); -} - -sub NEWdelitem { - my ($dbh,$bibid,$itemnumber)=@_; - my $biblio = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid); - &OLDdelitem($dbh,$itemnumber); - &MARCdelitem($dbh,$bibid,$itemnumber); -} - -# -# -# OLD OLD OLD OLD OLD OLD OLD OLD OLD OLD OLD OLD OLD OLD OLD OLD OLD -# -# - -=item $biblionumber = OLDnewbiblio($dbh,$biblio); - -adds a record in biblio table. Datas are in the hash $biblio. - -=item $biblionumber = OLDmodbiblio($dbh,$biblio); - -modify a record in biblio table. Datas are in the hash $biblio. - -=item OLDmodsubtitle($dbh,$bibnum,$subtitle); - -modify subtitles in bibliosubtitle table. - -=item OLDmodaddauthor($dbh,$bibnum,$author); - -adds or modify additional authors -NOTE : Strange sub : seems to delete MANY and add only ONE author... maybe buggy ? - -=item $errors = OLDmodsubject($dbh,$bibnum, $force, @subject); - -modify/adds subjects - -=item OLDmodbibitem($dbh, $biblioitem); - -modify a biblioitem - -=item OLDmodnote($dbh,$bibitemnum,$note - -modify a note for a biblioitem - -=item OLDnewbiblioitem($dbh,$biblioitem); - -adds a biblioitem ($biblioitem is a hash with the values) - -=item OLDnewsubject($dbh,$bibnum); - -adds a subject - -=item OLDnewsubtitle($dbh,$bibnum,$subtitle); - -create a new subtitle - -=item ($itemnumber,$errors)= OLDnewitems($dbh,$item,$barcode); - -create a item. $item is a hash and $barcode the barcode. - -=item OLDmoditem($dbh,$item); - -modify item - -=item OLDdelitem($dbh,$itemnum); - -delete item - -=item OLDdeletebiblioitem($dbh,$biblioitemnumber); - -deletes a biblioitem -NOTE : not standard sub name. Should be OLDdelbiblioitem() - -=item OLDdelbiblio($dbh,$biblio); - -delete a biblio - -=cut - -sub OLDnewbiblio { - my ($dbh,$biblio) = @_; -# my $dbh = &C4Connect; - my $sth = $dbh->prepare("Select max(biblionumber) from biblio"); - $sth->execute; - my $data = $sth->fetchrow_arrayref; - my $bibnum = $$data[0] + 1; - my $series = 0; - - if ($biblio->{'seriestitle'}) { $series = 1 }; - $sth->finish; - $sth = $dbh->prepare("insert into biblio set biblionumber = ?, title = ?, author = ?, copyrightdate = ?, serial = ?, seriestitle = ?, notes = ?, abstract = ?"); - $sth->execute($bibnum,$biblio->{'title'},$biblio->{'author'},$biblio->{'copyrightdate'},$biblio->{'serial'},$biblio->{'seriestitle'},$biblio->{'notes'},$biblio->{'abstract'}); - - $sth->finish; -# $dbh->disconnect; - return($bibnum); -} - -sub OLDmodbiblio { - my ($dbh,$biblio) = @_; - # my $dbh = C4Connect; - my $query; - my $sth; - - $query = ""; - $sth = $dbh->prepare("Update biblio set title = ?, author = ?, abstract = ?, copyrightdate = ?, seriestitle = ?, serial = ?, unititle = ?, notes = ? where biblionumber = ?"); - $sth->execute($biblio->{'title'},$biblio->{'author'},$biblio->{'abstract'},$biblio->{'copyrightdate'}, $biblio->{'seriestitle'},$biblio->{'serial'},$biblio->{'unititle'},$biblio->{'notes'},$biblio->{'biblionumber'}); - - $sth->finish; - return($biblio->{'biblionumber'}); -} # sub modbiblio - -sub OLDmodsubtitle { - my ($dbh,$bibnum, $subtitle) = @_; - my $sth = $dbh->prepare("update bibliosubtitle set subtitle = ? where biblionumber = ?"); - $sth->execute($subtitle,$bibnum); - $sth->finish; -} # sub modsubtitle - - -sub OLDmodaddauthor { - my ($dbh,$bibnum, $author) = @_; -# my $dbh = C4Connect; - my $sth = $dbh->prepare("Delete from additionalauthors where biblionumber = ?"); - - $sth->execute($bibnum); - $sth->finish; - - if ($author ne '') { - $sth = $dbh->prepare("Insert into additionalauthors set author = ?, biblionumber = ?"); - - $sth->execute($author,$bibnum); - - $sth->finish; - } # if -} # sub modaddauthor - - -sub OLDmodsubject { - my ($dbh,$bibnum, $force, @subject) = @_; - # my $dbh = C4Connect; - my $count = @subject; - my $error; - for (my $i = 0; $i < $count; $i++) { - $subject[$i] =~ s/^ //g; - $subject[$i] =~ s/ $//g; - my $sth = $dbh->prepare("select * from catalogueentry where entrytype = 's' and catalogueentry = ?"); - $sth->execute($subject[$i]); - - if (my $data = $sth->fetchrow_hashref) { - } else { - if ($force eq $subject[$i] || $force == 1) { - # subject not in aut, chosen to force anway - # so insert into cataloguentry so its in auth file - my $sth2 = $dbh->prepare("Insert into catalogueentry (entrytype,catalogueentry) values ('s',?)"); - - $sth2->execute($subject[$i]); - $sth2->finish; - } else { - $error = "$subject[$i]\n does not exist in the subject authority file"; - my $sth2 = $dbh->prepare("Select * from catalogueentry where entrytype = 's' and (catalogueentry like ? or catalogueentry like ? or catalogueentry like ?)"); - $sth2->execute("$subject[$i] %","% $subject[$i] %","% $subject[$i]"); - while (my $data = $sth2->fetchrow_hashref) { - $error .= "
$data->{'catalogueentry'}"; - } # while - $sth2->finish; - } # else - } # else - $sth->finish; - } # else - if ($error eq '') { - my $sth = $dbh->prepare("Delete from bibliosubject where biblionumber = ?"); - $sth->execute($bibnum); - $sth->finish; - $sth = $dbh->prepare("Insert into bibliosubject values (?,?)"); - my $query; - foreach $query (@subject) { - $sth->execute($query,$bibnum); - } # foreach - $sth->finish; - } # if - - # $dbh->disconnect; - return($error); -} # sub modsubject - -sub OLDmodbibitem { - my ($dbh,$biblioitem) = @_; -# my $dbh = C4Connect; - my $query; - - $biblioitem->{'itemtype'} = $dbh->quote($biblioitem->{'itemtype'}); - $biblioitem->{'url'} = $dbh->quote($biblioitem->{'url'}); - $biblioitem->{'isbn'} = $dbh->quote($biblioitem->{'isbn'}); - $biblioitem->{'publishercode'} = $dbh->quote($biblioitem->{'publishercode'}); - $biblioitem->{'publicationyear'} = $dbh->quote($biblioitem->{'publicationyear'}); - $biblioitem->{'classification'} = $dbh->quote($biblioitem->{'classification'}); - $biblioitem->{'dewey'} = $dbh->quote($biblioitem->{'dewey'}); - $biblioitem->{'subclass'} = $dbh->quote($biblioitem->{'subclass'}); - $biblioitem->{'illus'} = $dbh->quote($biblioitem->{'illus'}); - $biblioitem->{'pages'} = $dbh->quote($biblioitem->{'pages'}); - $biblioitem->{'volumeddesc'} = $dbh->quote($biblioitem->{'volumeddesc'}); - $biblioitem->{'bnotes'} = $dbh->quote($biblioitem->{'bnotes'}); - $biblioitem->{'size'} = $dbh->quote($biblioitem->{'size'}); - $biblioitem->{'place'} = $dbh->quote($biblioitem->{'place'}); - - $query = "Update biblioitems set -itemtype = $biblioitem->{'itemtype'}, -url = $biblioitem->{'url'}, -isbn = $biblioitem->{'isbn'}, -publishercode = $biblioitem->{'publishercode'}, -publicationyear = $biblioitem->{'publicationyear'}, -classification = $biblioitem->{'classification'}, -dewey = $biblioitem->{'dewey'}, -subclass = $biblioitem->{'subclass'}, -illus = $biblioitem->{'illus'}, -pages = $biblioitem->{'pages'}, -volumeddesc = $biblioitem->{'volumeddesc'}, -notes = $biblioitem->{'bnotes'}, -size = $biblioitem->{'size'}, -place = $biblioitem->{'place'} -where biblioitemnumber = $biblioitem->{'biblioitemnumber'}"; - -$dbh->do($query); -if ($dbh->errstr) { - warn "$query"; -} -# $dbh->disconnect; -} # sub modbibitem - -sub OLDmodnote { - my ($dbh,$bibitemnum,$note)=@_; -# my $dbh=C4Connect; - my $query="update biblioitems set notes='$note' where - biblioitemnumber='$bibitemnum'"; - my $sth=$dbh->prepare($query); - $sth->execute; - $sth->finish; -# $dbh->disconnect; -} - -sub OLDnewbiblioitem { - my ($dbh,$biblioitem) = @_; - # my $dbh = C4Connect; - my $sth = $dbh->prepare("Select max(biblioitemnumber) from biblioitems"); - my $data; - my $bibitemnum; - - $sth->execute; - $data = $sth->fetchrow_arrayref; - $bibitemnum = $$data[0] + 1; - - $sth->finish; - - $sth = $dbh->prepare("insert into biblioitems set - biblioitemnumber = ?, biblionumber = ?, - volume = ?, number = ?, - classification = ?, itemtype = ?, - url = ?, isbn = ?, - issn = ?, dewey = ?, - subclass = ?, publicationyear = ?, - publishercode = ?, volumedate = ?, - volumeddesc = ?, illus = ?, - pages = ?, notes = ?, - size = ?, lccn = ?, - marc = ?, place = ?"); - $sth->execute($bibitemnum, $biblioitem->{'biblionumber'}, - $biblioitem->{'volume'}, $biblioitem->{'number'}, - $biblioitem->{'classification'}, $biblioitem->{'itemtype'}, - $biblioitem->{'url'}, $biblioitem->{'isbn'}, - $biblioitem->{'issn'}, $biblioitem->{'dewey'}, - $biblioitem->{'subclass'}, $biblioitem->{'publicationyear'}, - $biblioitem->{'publishercode'}, $biblioitem->{'volumedate'}, - $biblioitem->{'volumeddesc'}, $biblioitem->{'illus'}, - $biblioitem->{'pages'}, $biblioitem->{'bnotes'}, - $biblioitem->{'size'}, $biblioitem->{'lccn'}, - $biblioitem->{'marc'}, $biblioitem->{'place'}); - $sth->finish; - # $dbh->disconnect; - return($bibitemnum); -} - -sub OLDnewsubject { - my ($dbh,$bibnum)=@_; - my $sth=$dbh->prepare("insert into bibliosubject (biblionumber) values (?)"); - $sth->execute($bibnum); - $sth->finish; -} - -sub OLDnewsubtitle { - my ($dbh,$bibnum, $subtitle) = @_; - my $sth = $dbh->prepare("insert into bibliosubtitle set biblionumber = ?, subtitle = ?"); - $sth->execute($bibnum,$subtitle); - $sth->finish; -} - - -sub OLDnewitems { - my ($dbh,$item, $barcode) = @_; - # my $dbh = C4Connect; - my $sth = $dbh->prepare("Select max(itemnumber) from items"); - my $data; - my $itemnumber; - my $error = ""; - - $sth->execute; - $data = $sth->fetchrow_hashref; - $itemnumber = $data->{'max(itemnumber)'} + 1; - $sth->finish; -# FIXME the "notforloan" field seems to be named "loan" in some places. workaround bugfix. - if ($item->{'loan'}) { - $item->{'notforloan'} = $item->{'loan'}; - } -# if dateaccessioned is provided, use it. Otherwise, set to NOW() - if ($item->{'dateaccessioned'}) { - $sth=$dbh->prepare("Insert into items set - itemnumber = ?, biblionumber = ?, - biblioitemnumber = ?, barcode = ?, - booksellerid = ?, dateaccessioned = ?, - homebranch = ?, holdingbranch = ?, - price = ?, replacementprice = ?, - replacementpricedate = NOW(), itemnotes = ?, - bulk =?, notforloan = ? - "); - $sth->execute($itemnumber, $item->{'biblionumber'}, - $item->{'biblioitemnumber'},$barcode, - $item->{'booksellerid'},$item->{'dateaccessioned'}, - $item->{'homebranch'},$item->{'holdingbranch'}, - $item->{'price'},$item->{'replacementprice'}, - $item->{'itemnotes'},$item->{'bulk'},$item->{'notforloan'}); - } else { - $sth=$dbh->prepare("Insert into items set - itemnumber = ?, biblionumber = ?, - biblioitemnumber = ?, barcode = ?, - booksellerid = ?, dateaccessioned = NOW(), - homebranch = ?, holdingbranch = ?, - price = ?, replacementprice = ?, - replacementpricedate = NOW(), itemnotes = ?, - bulk = ? , notforloan = ? - "); - $sth->execute($itemnumber, $item->{'biblionumber'}, - $item->{'biblioitemnumber'},$barcode, - $item->{'booksellerid'}, - $item->{'homebranch'},$item->{'holdingbranch'}, - $item->{'price'},$item->{'replacementprice'}, - $item->{'itemnotes'},$item->{'bulk'},$item->{'notforloan'}); - } - if (defined $sth->errstr) { - $error .= $sth->errstr; - } - $sth->finish; - return($itemnumber,$error); -} - -sub OLDmoditem { - my ($dbh,$item) = @_; -# my ($dbh,$loan,$itemnum,$bibitemnum,$barcode,$notes,$homebranch,$lost,$wthdrawn,$replacement)=@_; -# my $dbh=C4Connect; -$item->{'itemnum'}=$item->{'itemnumber'} unless $item->{'itemnum'}; - my $query="update items set barcode=?,itemnotes=?,bulk=?,notforloan=? where itemnumber=?"; - my @bind = ($item->{'barcode'},$item->{'notes'},$item->{'bulk'},$item->{'notforloan'},$item->{'itemnum'}); -# if ($item->{'barcode'} eq ''){ -# $item->{'notforloan'}=0 unless $item->{'notforloan'}; -# $query="update items set notforloan=? where itemnumber=?"; -# @bind = ($item->{'notforloan'},$item->{'itemnum'}); -# } - if ($item->{'lost'} ne ''){ - $query="update items set biblioitemnumber=?, - barcode=?, - itemnotes=?, - homebranch=?, - itemlost=?, - wthdrawn=?, - bulk=?, - notforloan=? - where itemnumber=?"; - @bind = ($item->{'bibitemnum'},$item->{'barcode'},$item->{'notes'},$item->{'homebranch'},$item->{'lost'},$item->{'wthdrawn'},$item->{'bulk'},$item->{'notforloan'},$item->{'itemnum'}); - } - if ($item->{'replacement'} ne ''){ - $query=~ s/ where/,replacementprice='$item->{'replacement'}' where/; - } - warn "Q : $query"; - my $sth=$dbh->prepare($query); - $sth->execute(@bind); - $sth->finish; -# $dbh->disconnect; -} - -sub OLDdelitem{ - my ($dbh,$itemnum)=@_; - # my $dbh=C4Connect; - my $sth=$dbh->prepare("select * from items where itemnumber=?"); - $sth->execute($itemnum); - my $data=$sth->fetchrow_hashref; - $sth->finish; - my $query="Insert into deleteditems set "; - my @bind = (); - foreach my $temp (keys %$data){ - $query .= "$temp = ?,"; - push(@bind,$data->{$temp}); - } - $query =~ s/\,$//; -# print $query; - $sth=$dbh->prepare($query); - $sth->execute(@bind); - $sth->finish; - $sth=$dbh->prepare("Delete from items where itemnumber=?"); - $sth->execute($itemnum); - $sth->finish; -# $dbh->disconnect; -} - -sub OLDdeletebiblioitem { - my ($dbh,$biblioitemnumber) = @_; -# my $dbh = C4Connect; - my $sth = $dbh->prepare("Select * from biblioitems -where biblioitemnumber = ?"); - my $results; - - $sth->execute($biblioitemnumber); - - if ($results = $sth->fetchrow_hashref) { - $sth->finish; - $sth=$dbh->prepare("Insert into deletedbiblioitems (biblioitemnumber, biblionumber, volume, number, classification, itemtype, - isbn, issn ,dewey ,subclass ,publicationyear ,publishercode ,volumedate ,volumeddesc ,timestamp ,illus , - pages ,notes ,size ,url ,lccn ) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"); - - $sth->execute($results->{biblioitemnumber}, $results->{biblionumber}, $results->{volume}, $results->{number}, $results->{classification}, $results->{itemtype}, - $results->{isbn}, $results->{issn} ,$results->{dewey} ,$results->{subclass} ,$results->{publicationyear} ,$results->{publishercode} ,$results->{volumedate} ,$results->{volumeddesc} ,$results->{timestamp} ,$results->{illus} , - $results->{pages} ,$results->{notes} ,$results->{size} ,$results->{url} ,$results->{lccn} ); - my $sth2 = $dbh->prepare("Delete from biblioitems where biblioitemnumber = ?"); - $sth2->execute($biblioitemnumber); - $sth2->finish(); - } # if - $sth->finish; -# Now delete all the items attached to the biblioitem - $sth = $dbh->prepare("Select * from items where biblioitemnumber = ?"); - $sth->execute($biblioitemnumber); - my @results; - while (my $data = $sth->fetchrow_hashref) { - my $query="Insert into deleteditems set "; - my @bind = (); - foreach my $temp (keys %$data){ - $query .= "$temp = ?,"; - push(@bind,$data->{$temp}); - } - $query =~ s/\,$//; - my $sth2=$dbh->prepare($query); - $sth2->execute(@bind); - } # while - $sth->finish; - $sth = $dbh->prepare("Delete from items where biblioitemnumber = ?"); - $sth->execute($biblioitemnumber); - $sth->finish(); -# $dbh->disconnect; -} # sub deletebiblioitem - -sub OLDdelbiblio{ - my ($dbh,$biblio)=@_; - my $sth=$dbh->prepare("select * from biblio where biblionumber=?"); - $sth->execute($biblio); - if (my $data=$sth->fetchrow_hashref){ - $sth->finish; - my $query="Insert into deletedbiblio set "; - my @bind =(); - foreach my $temp (keys %$data){ - $query .= "$temp = ?,"; - push(@bind,$data->{$temp}); - } - #replacing the last , by ",?)" - $query=~ s/\,$//; - $sth=$dbh->prepare($query); - $sth->execute(@bind); - $sth->finish; - $sth=$dbh->prepare("Delete from biblio where biblionumber=?"); - $sth->execute($biblio); - $sth->finish; - } - $sth->finish; -} - -# -# -# old functions -# -# - -sub itemcount{ - my ($biblio)=@_; - my $dbh = C4::Context->dbh; -# print $query; - my $sth=$dbh->prepare("Select count(*) from items where biblionumber=?"); - $sth->execute($biblio); - my $data=$sth->fetchrow_hashref; - $sth->finish; - return($data->{'count(*)'}); -} - -sub newbiblio { - my ($biblio) = @_; - my $dbh = C4::Context->dbh; - my $bibnum=OLDnewbiblio($dbh,$biblio); - # finds new (MARC bibid -# my $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$bibnum); - my $record = &MARCkoha2marcBiblio($dbh,$bibnum); - MARCaddbiblio($dbh,$record,$bibnum); - return($bibnum); -} - -=item modbiblio - - $biblionumber = &modbiblio($biblio); - -Update a biblio record. - -C<$biblio> is a reference-to-hash whose keys are the fields in the -biblio table in the Koha database. All fields must be present, not -just the ones you wish to change. - -C<&modbiblio> updates the record defined by -C<$biblio-E{biblionumber}> with the values in C<$biblio>. - -C<&modbiblio> returns C<$biblio-E{biblionumber}> whether it was -successful or not. - -=cut - -sub modbiblio { - my ($biblio) = @_; - my $dbh = C4::Context->dbh; - my $biblionumber=OLDmodbiblio($dbh,$biblio); - my $record = MARCkoha2marcBiblio($dbh,$biblionumber,$biblionumber); - # finds new (MARC bibid - my $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber); - MARCmodbiblio($dbh,$bibid,$record,0); - return($biblionumber); -} # sub modbiblio - -=item modsubtitle - - &modsubtitle($biblionumber, $subtitle); - -Sets the subtitle of a book. - -C<$biblionumber> is the biblionumber of the book to modify. - -C<$subtitle> is the new subtitle. - -=cut - -sub modsubtitle { - my ($bibnum, $subtitle) = @_; - my $dbh = C4::Context->dbh; - &OLDmodsubtitle($dbh,$bibnum,$subtitle); -} # sub modsubtitle - -=item modaddauthor - - &modaddauthor($biblionumber, $author); - -Replaces all additional authors for the book with biblio number -C<$biblionumber> with C<$author>. If C<$author> is the empty string, -C<&modaddauthor> deletes all additional authors. - -=cut - -sub modaddauthor { - my ($bibnum, $author) = @_; - my $dbh = C4::Context->dbh; - &OLDmodaddauthor($dbh,$bibnum,$author); -} # sub modaddauthor - -=item modsubject - - $error = &modsubject($biblionumber, $force, @subjects); - -$force - a subject to force - -$error - Error message, or undef if successful. - -=cut - -sub modsubject { - my ($bibnum, $force, @subject) = @_; - my $dbh = C4::Context->dbh; - my $error= &OLDmodsubject($dbh,$bibnum,$force, @subject); - return($error); -} # sub modsubject - -sub modbibitem { - my ($biblioitem) = @_; - my $dbh = C4::Context->dbh; - &OLDmodbibitem($dbh,$biblioitem); -} # sub modbibitem - -sub modnote { - my ($bibitemnum,$note)=@_; - my $dbh = C4::Context->dbh; - &OLDmodnote($dbh,$bibitemnum,$note); -} - -sub newbiblioitem { - my ($biblioitem) = @_; - my $dbh = C4::Context->dbh; - my $bibitemnum = &OLDnewbiblioitem($dbh,$biblioitem); - my $MARCbiblio= MARCkoha2marcBiblio($dbh,0,$bibitemnum); # the 0 means "do NOT retrieve biblio, only biblioitem, in the MARC record - my $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblioitem->{biblionumber}); - &MARCaddbiblio($dbh,$MARCbiblio,$biblioitem->{biblionumber},$bibid); - return($bibitemnum); -} - -sub newsubject { - my ($bibnum)=@_; - my $dbh = C4::Context->dbh; - &OLDnewsubject($dbh,$bibnum); -} - -sub newsubtitle { - my ($bibnum, $subtitle) = @_; - my $dbh = C4::Context->dbh; - &OLDnewsubtitle($dbh,$bibnum,$subtitle); -} - -sub newitems { - my ($item, @barcodes) = @_; - my $dbh = C4::Context->dbh; - my $errors; - my $itemnumber; - my $error; - foreach my $barcode (@barcodes) { - ($itemnumber,$error)=&OLDnewitems($dbh,$item,uc($barcode)); - $errors .=$error; - my $MARCitem = &MARCkoha2marcItem($dbh,$item->{biblionumber},$itemnumber); - &MARCadditem($dbh,$MARCitem,$item->{biblionumber}); - } - return($errors); -} - -sub moditem { - my ($item) = @_; - my $dbh = C4::Context->dbh; - &OLDmoditem($dbh,$item); - my $MARCitem = &MARCkoha2marcItem($dbh,$item->{'biblionumber'},$item->{'itemnum'}); - my $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$item->{biblionumber}); - &MARCmoditem($dbh,$MARCitem,$bibid,$item->{itemnum},0); -} - -sub checkitems{ - my ($count,@barcodes)=@_; - my $dbh = C4::Context->dbh; - my $error; - my $sth=$dbh->prepare("Select * from items where barcode=?"); - for (my $i=0;$i<$count;$i++){ - $barcodes[$i]=uc $barcodes[$i]; - $sth->execute($barcodes[$i]); - if (my $data=$sth->fetchrow_hashref){ - $error.=" Duplicate Barcode: $barcodes[$i]"; - } - } - $sth->finish; - return($error); -} - -sub countitems{ - my ($bibitemnum)=@_; - my $dbh = C4::Context->dbh; - my $query=""; - my $sth=$dbh->prepare("Select count(*) from items where biblioitemnumber=?"); - $sth->execute($bibitemnum); - my $data=$sth->fetchrow_hashref; - $sth->finish; - return($data->{'count(*)'}); -} - -sub delitem{ - my ($itemnum)=@_; - my $dbh = C4::Context->dbh; - &OLDdelitem($dbh,$itemnum); -} - -sub deletebiblioitem { - my ($biblioitemnumber) = @_; - my $dbh = C4::Context->dbh; - &OLDdeletebiblioitem($dbh,$biblioitemnumber); -} # sub deletebiblioitem - - -sub delbiblio { - my ($biblio)=@_; - my $dbh = C4::Context->dbh; - &OLDdelbiblio($dbh,$biblio); - my $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblio); - &MARCdelbiblio($dbh,$bibid,0); -} - -sub getbiblio { - my ($biblionumber) = @_; - my $dbh = C4::Context->dbh; - my $sth = $dbh->prepare("Select * from biblio where biblionumber = ?"); - # || die "Cannot prepare $query\n" . $dbh->errstr; - my $count = 0; - my @results; - - $sth->execute($biblionumber); - # || die "Cannot execute $query\n" . $sth->errstr; - while (my $data = $sth->fetchrow_hashref) { - $results[$count] = $data; - $count++; - } # while - - $sth->finish; - return($count, @results); -} # sub getbiblio - -sub getbiblioitem { - my ($biblioitemnum) = @_; - my $dbh = C4::Context->dbh; - my $sth = $dbh->prepare("Select * from biblioitems where -biblioitemnumber = ?"); - my $count = 0; - my @results; - - $sth->execute($biblioitemnum); - - while (my $data = $sth->fetchrow_hashref) { - $results[$count] = $data; - $count++; - } # while - - $sth->finish; - return($count, @results); -} # sub getbiblioitem - -sub getbiblioitembybiblionumber { - my ($biblionumber) = @_; - my $dbh = C4::Context->dbh; - my $sth = $dbh->prepare("Select * from biblioitems where biblionumber = ?"); - my $count = 0; - my @results; - - $sth->execute($biblionumber); - - while (my $data = $sth->fetchrow_hashref) { - $results[$count] = $data; - $count++; - } # while - - $sth->finish; - return($count, @results); -} # sub - -sub getitemsbybiblioitem { - my ($biblioitemnum) = @_; - my $dbh = C4::Context->dbh; - my $sth = $dbh->prepare("Select * from items, biblio where -biblio.biblionumber = items.biblionumber and biblioitemnumber -= ?"); - # || die "Cannot prepare $query\n" . $dbh->errstr; - my $count = 0; - my @results; - - $sth->execute($biblioitemnum); - # || die "Cannot execute $query\n" . $sth->errstr; - while (my $data = $sth->fetchrow_hashref) { - $results[$count] = $data; - $count++; - } # while - - $sth->finish; - return($count, @results); -} # sub getitemsbybiblioitem - - -sub logchange { -# Subroutine to log changes to databases -# Eventually, this subroutine will be used to create a log of all changes made, -# with the possibility of "undo"ing some changes - my $database=shift; - if ($database eq 'kohadb') { - my $type=shift; - my $section=shift; - my $item=shift; - my $original=shift; - my $new=shift; -# print STDERR "KOHA: $type $section $item $original $new\n"; - } elsif ($database eq 'marc') { - my $type=shift; - my $Record_ID=shift; - my $tag=shift; - my $mark=shift; - my $subfield_ID=shift; - my $original=shift; - my $new=shift; -# print STDERR "MARC: $type $Record_ID $tag $mark $subfield_ID $original $new\n"; - } -} - -#------------------------------------------------ - - -#--------------------------------------- -# Find a biblio entry, or create a new one if it doesn't exist. -# If a "subtitle" entry is in hash, add it to subtitle table -sub getoraddbiblio { - # input params - my ( - $dbh, # db handle - # FIXME - Unused argument - $biblio, # hash ref to fields - )=@_; - - # return - my $biblionumber; - - my $debug=0; - my $sth; - my $error; - - #----- - $dbh = C4::Context->dbh; - - print "
Looking for biblio
\n" if $debug; - $sth=$dbh->prepare("select biblionumber - from biblio - where title=? and author=? - and copyrightdate=? and seriestitle=?"); - $sth->execute( - $biblio->{title}, $biblio->{author}, - $biblio->{copyright}, $biblio->{seriestitle} ); - if ($sth->rows) { - ($biblionumber) = $sth->fetchrow; - print "
Biblio exists with number $biblionumber
\n" if $debug; - } else { - # Doesn't exist. Add new one. - print "
Adding biblio
\n" if $debug; - ($biblionumber,$error)=&newbiblio($biblio); - if ( $biblionumber ) { - print "
Added with biblio number=$biblionumber
\n" if $debug; - if ( $biblio->{subtitle} ) { - &newsubtitle($biblionumber,$biblio->{subtitle} ); - } # if subtitle - } else { - print "
Couldn't add biblio: $error
\n" if $debug; - } # if added - } - - return $biblionumber,$error; - -} # sub getoraddbiblio - -sub char_decode { - # converts ISO 5426 coded string to ISO 8859-1 - # sloppy code : should be improved in next issue - my ($string,$encoding) = @_ ; - $_ = $string ; - -# $encoding = C4::Context->preference("marcflavour") unless $encoding; - if ($encoding eq "UNIMARC") { - # this handles non-sorting blocks (if implementation requires this) - $string = nsb_clean($_) ; - } elsif ($encoding eq "USMARC" || $encoding eq "MARC21") { - # POLSKIE akcent - s/(\xe2|\xc2)c/\xc4\x87/gm ; - s/(\xe2|\xc2)C/\xc4\x86/gm ; - s/(\xe2|\xc2)n/\xc5\x84/gm ; - s/(\xe2|\xc2)N/\xc5\x83/gm ; - s/(\xe2|\xc2)o/\xc3\xb3/gm ; - s/(\xe2|\xc2)O/\xc3\x93/gm ; - s/(\xe2|\xc2)s/\xc5\x9b/gm ; - s/(\xe2|\xc2)S/\xc5\x9a/gm ; - s/(\xe2|\xc2)z/\xc5\xba/gm ; - s/(\xe2|\xc2)Z/\xc5\xb9/gm ; - #ogonek - s/(\xf1|\xce)a/\xc4\x85/gm ; - s/(\xf1|\xce)A/\xc4\x84/gm ; - s/(\xf1|\xce)e/\xc4\x99/gm ; - s/(\xf1|\xce)E/\xc4\x98/gm ; - # ³£ - s/(\xb1|\xf8)/\xc5\x82/gm ; - s/(\xa1|\xe8)/\xc5\x82/gm ; - #¿¯ - s/(\xe7|\xc7)z/\xc5\xbc/gm ; - s/(\xe7|\xc7)Z/\xc5\xbb/gm ; - # ZACHODNIE akcent - s/(\xe2|\xc2)a/\xc3\xa1/gm ; - s/(\xe2|\xc2)A/\xc3\x81/gm ; - s/(\xe2|\xc2)e/\xc3\xa9/gm ; - s/(\xe2|\xc2)E/\xc3\x89/gm ; - s/(\xe2|\xc2)i/\xc3\xad/gm ; - s/(\xe2|\xc2)I/\xc3\x8d/gm ; - s/(\xe2|\xc2)u/\xc3\xba/gm ; - s/(\xe2|\xc2)U/\xc3\x9a/gm ; - s/(\xe2|\xc2)y/\xc3\xbd/gm ; - s/(\xe2|\xc2)Y/\xc3\x9d/gm ; - # grave ~0 - s/(\xe1|\xc1)a/\xc3\xa0/gm ; - s/(\xe1|\xc1)A/\xc3\x80/gm ; - s/(\xe1|\xc1)e/\xc3\xa8/gm ; - s/(\xe1|\xc1)E/\xc3\x88/gm ; - s/(\xe1|\xc1)i/\xc3\xac/gm ; - s/(\xe1|\xc1)I/\xc3\x8c/gm ; - s/(\xe1|\xc1)o/\xc3\xb2/gm ; - s/(\xe1|\xc1)O/\xc3\x92/gm ; - s/(\xe1|\xc1)u/\xc3\xb9/gm ; - s/(\xe1|\xc1)U/\xc3\x99/gm ; - # circumflex - daszek w górê ~1 - s/(\xe3|\xc3)a/\xc3\xa2/gm ; - s/(\xe3|\xc3)A/\xc3\x82/gm ; - s/(\xe3|\xc3)c/\xc3\x8a/gm ; - s/(\xe3|\xc3)C/\xc3\x89/gm ; - s/(\xe3|\xc3)e/\xc3\xaa/gm ; - s/(\xe3|\xc3)E/\xc3\x8a/gm ; - s/(\xe3|\xc3)i/\xc3\xae/gm ; - s/(\xe3|\xc3)I/\xc3\x8e/gm ; - s/(\xe3|\xc3)o/\xc3\xb4/gm ; - s/(\xe3|\xc3)O/\xc3\x94/gm ; - s/(\xe3|\xc3)u/\xc3\xbb/gm ; - s/(\xe3|\xc3)U/\xc3\x9b/gm ; - # diaeresis umlaut ~: - s/(\xe8|\xc8)a/\xc3\xa4/gm ; - s/(\xe8|\xc8)A/\xc3\x84/gm ; - s/(\xe8|\xc8)e/\xc3\xab/gm ; - s/(\xe8|\xc8)E/\xc3\x8b/gm ; - s/(\xe8|\xc8)i/\xc3\xaf/gm ; - s/(\xe8|\xc8)I/\xc3\x8f/gm ; - s/(\xe8|\xc8)o/\xc3\xb6/gm ; - s/(\xe8|\xc8)O/\xc3\x96/gm ; - s/(\xe8|\xc8)u/\xc3\xbc/gm ; - s/(\xe8|\xc8)U/\xc3\x9c/gm ; - # ~ss ISO - s/\xfb/\xc3\x9f/gm ; - #cedilla ~9c - s/(\xf0|\xcb)c/\xc3\xa7/gm; - s/(\xf0|\xcb)C/\xc3\x87/gm; - # caron - daszek w do³ ~5 - s/(\xe9|\xcf)c/\xc4\x8d/gm; - s/(\xe9|\xcf)C/\xc4\x8c/gm; - s/(\xe9|\xcf)d/\xc4\x8f/gm; - s/(\xe9|\xcf)D/\xc4\x8e/gm; - s/(\xe9|\xcf)e/\xc4\x9b/gm; - s/(\xe9|\xcf)E/\xc4\x9a/gm; - s/(\xe9|\xcf)r/\xc5\x99/gm; - s/(\xe9|\xcf)R/\xc5\x98/gm; - s/(\xe9|\xcf)s/\xc5\xa1/gm; - s/(\xe9|\xcf)S/\xc5\xa0/gm; - s/(\xe9|\xcf)z/\xc5\xbe/gm; - s/(\xe9|\xcf)Z/\xc5\xbd/gm; - - $string = nsb_clean($_) ; - #} - } - # also remove | - $string =~ s/\|//g; - return($string) ; -} - -sub nsb_clean { - my $NSB = '\x88' ; # NSB : begin Non Sorting Block - my $NSE = '\x89' ; # NSE : Non Sorting Block end - # handles non sorting blocks - my ($string) = @_ ; - $_ = $string ; - s/$NSB/(/gm ; - s/[ ]{0,1}$NSE/) /gm ; - $string = $_ ; - return($string) ; -} - -END { } # module clean-up code here (global destructor) - -=back - -=head1 AUTHOR - -Koha Developement team - -Paul POULAIN paul.poulain@free.fr - -=cut - -# $Id$ -# $Log$ -# Revision 1.4 2006/07/19 08:56:36 toins -# function getsingleorder deleted. It was already writed on C4::Catalogue. -# -# Revision 1.3 2006/07/12 17:23:48 toins -# getitemtypes renamed to GetItemTypes -# -# Revision 1.2 2004/07/30 14:21:27 doxulting -# *** empty log message *** -# -# Revision 1.1 2004/05/02 18:06:58 kb2qzv -# Replacement file to be used as a temporary fix to get properly formatted records in UTF-8 when importing records from z39.50 server with win1250 (ISO 6937/2) charset. -# -# Revision 1.78.2.8 2004/03/25 13:22:06 tipaul -# * removing | in MARC datas (| should never be sent. In BNF z3950 server, the | is added at the beginning of almost every title. It's an historic feature that means nothing now but has not been deleted) -# * bugfix in MARC editor when a library has no barcode, the items table modifs did not work (adding worked) -# -# Revision 1.78.2.7 2004/03/24 17:30:35 joshferraro -# Fixes bug 749 by deleting the comma on line 1488 in Biblio.pm -# -# Revision 1.78.2.6 2004/03/19 14:36:07 tipaul -# fixing bug in char handling again... need help to fix it definetly, probably... -# -# Revision 1.78.2.5 2004/03/06 20:30:51 acli -# This should fix bug 727 -# -# If aqorderbreakdown is blank (i.e., the user ordered something before -# they defined a bookfund), the "left join" allows existing data to still -# be returned. -# -# The data now display correctly. But the bookfund data still can't be -# updated. I think that would count as a separate bug. -# -# Revision 1.78.2.4 2004/02/12 13:41:56 tipaul -# deleting duplicated subs (by buggy copy/paste probably) -# -# Revision 1.78.2.3 2004/02/10 13:15:46 tipaul -# removing 2 warnings -# -# Revision 1.78.2.2 2004/01/26 10:38:06 tipaul -# dealing correctly "bulk" field -# -# Revision 1.78.2.1 2004/01/13 17:29:53 tipaul -# * minor html fixes -# * adding publisher in acquisition process (& ordering basket by publisher) -# -# Revision 1.78 2003/12/09 15:57:28 tipaul -# rolling back to working char_decode sub -# -# Revision 1.77 2003/12/03 17:47:14 tipaul -# bugfixes for biblio deletion -# -# Revision 1.76 2003/12/03 01:43:41 slef -# conflict markers? -# -# Revision 1.75 2003/12/03 01:42:03 slef -# bug 662 fixes securing DBI -# -# Revision 1.74 2003/11/28 09:48:33 tipaul -# bugfix : misusing prepare & execute => now using prepare(?) and execute($var) -# -# Revision 1.73 2003/11/28 09:45:25 tipaul -# bugfix for iso2709 file import in the "notforloan" field. -# -# But notforloan field called "loan" somewhere, so in case "loan" is used, copied to "notforloan" to avoid a bug. -# -# Revision 1.72 2003/11/24 17:40:14 tipaul -# fix for #385 -# -# Revision 1.71 2003/11/24 16:28:49 tipaul -# biblio & item deletion now works fine in MARC editor. -# Stores deleted biblio/item in the marc field of the deletedbiblio/deleteditem table. -# -# Revision 1.70 2003/11/24 13:29:55 tipaul -# moving $id from beginning to end of file (70 commits... huge comments...) -# -# Revision 1.69 2003/11/24 13:27:17 tipaul -# fix for #380 (bibliosubject) -# -# Revision 1.68 2003/11/06 17:18:30 tipaul -# bugfix for #384 -# -# 1st draft for MARC biblio deletion. -# Still does not work well, but at least, Biblio.pm compiles & it should'nt break too many things -# (Note the trash in the MARCdetail, but don't use it, please :-) ) -# -# Revision 1.67 2003/10/25 08:46:27 tipaul -# minor fixes for bilbio deletion (still buggy) -# -# Revision 1.66 2003/10/17 10:02:56 tipaul -# Indexing only words longer than 2 letters. Was >=2 before, & 2 letters words usually means nothing. -# -# Revision 1.65 2003/10/14 09:45:29 tipaul -# adding rebuildnonmarc.pl script : run this script when you change a link between marc and non MARC DB. It rebuilds the non-MARC DB (long operation) -# -# Revision 1.64 2003/10/06 15:20:51 tipaul -# fix for 536 (subtitle error) -# -# Revision 1.63 2003/10/01 13:25:49 tipaul -# seems a char encoding problem modified something in char_decode sub... changing back to something that works... -# -# Revision 1.62 2003/09/17 14:21:13 tipaul -# fixing bug that makes a MARC biblio disappear when using full acquisition (order => recieve ==> MARC editor). -# Before this 2 lines fix, the MARC biblio was deleted during recieve, and had to be entirely recreated :-( -# -# Revision 1.61 2003/09/17 10:24:39 tipaul -# notforloan value in itemtype was overwritting notforloan value in a given item. -# I changed this behaviour : -# if notforloan is set for a given item, and NOT for all items from this itemtype, the notforloan is kept. -# If notforloan is set for itemtype, it's used (and impossible to loan a specific item from this itemtype) -# -# Revision 1.60 2003/09/04 14:11:23 tipaul -# fix for 593 (data duplication in MARC-DB) -# -# Revision 1.58 2003/08/06 12:54:52 tipaul -# fix for publicationyear : extracting numeric value from MARC string, like for copyrightdate. -# (note that copyrightdate still extracted to get numeric format) -# -# Revision 1.57 2003/07/15 23:09:18 slef -# change show columns to use biblioitems bnotes too -# -# Revision 1.56 2003/07/15 11:34:52 slef -# fixes from paul email -# -# Revision 1.55 2003/07/15 00:02:49 slef -# Work on bug 515... can we do a single-side rename of notes to bnotes? -# -# Revision 1.54 2003/07/11 11:51:32 tipaul -# *** empty log message *** -# -# Revision 1.52 2003/07/10 10:37:19 tipaul -# fix for copyrightdate problem, #514 -# -# Revision 1.51 2003/07/02 14:47:17 tipaul -# fix for #519 : items.dateaccessioned imports incorrectly -# -# Revision 1.49 2003/06/17 11:21:13 tipaul -# improvments/fixes for z3950 support. -# * Works now even on ADD, not only on MODIFY -# * able to search on ISBN, author, title -# -# Revision 1.48 2003/06/16 09:22:53 rangi -# Just added an order clause to getitemtypes -# -# Revision 1.47 2003/05/20 16:22:44 tipaul -# fixing typo in Biblio.pm POD -# -# Revision 1.46 2003/05/19 13:45:18 tipaul -# support for subtitles, additional authors, subject. -# This supports is only for MARC <-> OLD-DB link. It worked previously, but values entered as MARC were not reported to OLD-DB, neither values entered as OLD-DB were reported to MARC. -# Note that some OLD-DB subs are strange (dummy ?) see OLDmodsubject, OLDmodsubtitle, OLDmodaddiauthor in C4/Biblio.pm -# For example it seems impossible to have more that 1 addi author and 1 subtitle. In MARC it's not the case. So, if you enter more than one, I'm afraid only the LAST will be stored. -# -# Revision 1.45 2003/04/29 16:50:49 tipaul -# really proud of this commit :-) -# z3950 search and import seems to works fine. -# Let me explain how : -# * a "search z3950" button is added in the addbiblio template. -# * when clicked, a popup appears and z3950/search.pl is called -# * z3950/search.pl calls addz3950search in the DB -# * the z3950 daemon retrieve the records and stores them in z3950results AND in marc_breeding table. -# * as long as there as searches pending, the popup auto refresh every 2 seconds, and says how many searches are pending. -# * when the user clicks on a z3950 result => the parent popup is called with the requested biblio, and auto-filled -# -# Note : -# * character encoding support : (It's a nightmare...) In the z3950servers table, a "encoding" column has been added. You can put "UNIMARC" or "USMARC" in this column. Depending on this, the char_decode in C4::Biblio.pm replaces marc-char-encode by an iso 8859-1 encoding. Note that in the breeding import this value has been added too, for a better support. -# * the marc_breeding and z3950* tables have been modified : they have an encoding column and the random z3950 number is stored too for convenience => it's the key I use to list only requested biblios in the popup. -# -# Revision 1.44 2003/04/28 13:07:14 tipaul -# Those fixes solves the "internal server error" with MARC::Record 1.12. -# It was due to an illegal contruction in Koha : we tried to retrive subfields from <10 tags. -# That's not possible. MARC::Record accepted this in 0.93 version, but it was fixed after. -# Now, the construct/retrieving is OK ! -# -# Revision 1.43 2003/04/10 13:56:02 tipaul -# Fix some bugs : -# * worked in 1.9.0, but not in 1.9.1 : -# - modif of a biblio didn't work -# - empty fields where not shown when modifying a biblio. empty fields managed by the library (ie in tab 0->9 in MARC parameter table) MUST be entered, even if not presented. -# -# * did not work before : -# - repeatable subfields now works correctly. Enter 2 subfields separated by | and they will be splitted during saving. -# - dropped the last subfield of the MARC form :-( -# -# Internal changes : -# - MARCmodbiblio now works by deleting and recreating the biblio. It's not perf optimized, but MARC is a "do_something_impossible_to_trace" standard, so, it's the best solution. not a problem for me, as biblio are rarely modified. -# Note the MARCdelbiblio has been rewritted to enable deletion of a biblio WITHOUT deleting items. -# -# Revision 1.42 2003/04/04 08:41:11 tipaul -# last commits before 1.9.1 -# -# Revision 1.41 2003/04/01 12:26:43 tipaul -# fixes -# -# Revision 1.40 2003/03/11 15:14:03 tipaul -# pod updating -# -# Revision 1.39 2003/03/07 16:35:42 tipaul -# * moving generic functions to Koha.pm -# * improvement of SearchMarc.pm -# * bugfixes -# * code cleaning -# -# Revision 1.38 2003/02/27 16:51:59 tipaul -# * moving prepare / execute to ? form. -# * some # cleaning -# * little bugfix. -# * road to 1.9.2 => acquisition and cataloguing merging -# -# Revision 1.37 2003/02/12 11:03:03 tipaul -# Support for 000 -> 010 fields. -# Those fields doesn't have subfields. -# In koha, we will use a specific "trick" : fields <10 will have a "virtual" subfield : "@". -# Note it's only virtual : when rebuilding the MARC::Record, the koha API handle correctly "@" subfields => the resulting MARC record has a 00x field without subfield. -# -# Revision 1.36 2003/02/12 11:01:01 tipaul -# Support for 000 -> 010 fields. -# Those fields doesn't have subfields. -# In koha, we will use a specific "trick" : fields <10 will have a "virtual" subfield : "@". -# Note it's only virtual : when rebuilding the MARC::Record, the koha API handle correctly "@" subfields => the resulting MARC record has a 00x field without subfield. -# -# Revision 1.35 2003/02/03 18:46:00 acli -# Minor factoring in C4/Biblio.pm, plus change to export the per-tag -# 'mandatory' property to a per-subfield 'tag_mandatory' template parameter, -# so that addbiblio.tmpl can distinguish between mandatory subfields in a -# mandatory tag and mandatory subfields in an optional tag -# -# Not-minor factoring in acqui.simple/addbiblio.pl to make the if-else blocks -# smaller, and to add some POD; need further testing for this -# -# Added function to check if a MARC subfield name is "koha-internal" (instead -# of checking it for 'lib' and 'tag' everywhere); temporarily added to Koha.pm -# -# Use above function in acqui.simple/additem.pl and search.marc/search.pl -# -# Revision 1.34 2003/01/28 14:50:04 tipaul -# fixing MARCmodbiblio API and reindenting code -# -# Revision 1.33 2003/01/23 12:22:37 tipaul -# adding char_decode to decode MARC21 or UNIMARC extended chars -# -# Revision 1.32 2002/12/16 15:08:50 tipaul -# small but important bugfix (fixes a problem in export) -# -# Revision 1.31 2002/12/13 16:22:04 tipaul -# 1st draft of marc export -# -# Revision 1.30 2002/12/12 21:26:35 tipaul -# YAB ! (Yet Another Bugfix) => related to biblio modif -# (some warning cleaning too) -# -# Revision 1.29 2002/12/12 16:35:00 tipaul -# adding authentification with Auth.pm and -# MAJOR BUGFIX on marc biblio modification -# -# Revision 1.28 2002/12/10 13:30:03 tipaul -# fugfixes from Dombes Abbey work -# -# Revision 1.27 2002/11/19 12:36:16 tipaul -# road to 1.3.2 -# various bugfixes, improvments, and migration from acquisition.pm to biblio.pm -# -# Revision 1.26 2002/11/12 15:58:43 tipaul -# road to 1.3.2 : -# * many bugfixes -# * adding value_builder : you can map a subfield in the marc_subfield_structure to a sub stored in "value_builder" directory. In this directory you can create screen used to build values with any method. In this commit is a 1st draft of the builder for 100$a unimarc french subfield, which is composed of 35 digits, with 12 differents values (only the 4th first are provided for instance) -# -# Revision 1.25 2002/10/25 10:58:26 tipaul -# Road to 1.3.2 -# * bugfixes and improvements -# -# Revision 1.24 2002/10/24 12:09:01 arensb -# Fixed "no title" warning when generating HTML documentation from POD. -# -# Revision 1.23 2002/10/16 12:43:08 arensb -# Added some FIXME comments. -# -# Revision 1.22 2002/10/15 13:39:17 tipaul -# removing Acquisition.pm -# deleting unused code in biblio.pm, rewriting POD and answering most FIXME comments -# -# Revision 1.21 2002/10/13 11:34:14 arensb -# Replaced expressions of the form "$x = $x $y" with "$x = $y". -# Thus, $x = $x+2 becomes $x += 2, and so forth. -# -# Revision 1.20 2002/10/13 08:28:32 arensb -# Deleted unused variables. -# Removed trailing whitespace. -# -# Revision 1.19 2002/10/13 05:56:10 arensb -# Added some FIXME comments. -# -# Revision 1.18 2002/10/11 12:34:53 arensb -# Replaced &requireDBI with C4::Context->dbh -# -# Revision 1.17 2002/10/10 14:48:25 tipaul -# bugfixes -# -# Revision 1.16 2002/10/07 14:04:26 tipaul -# road to 1.3.1 : viewing MARC biblio -# -# Revision 1.15 2002/10/05 09:49:25 arensb -# Merged with arensb-context branch: use C4::Context->dbh instead of -# &C4Connect, and generally prefer C4::Context over C4::Database. -# -# Revision 1.14 2002/10/03 11:28:18 tipaul -# Extending Context.pm to add stopword management and using it in MARC-API. -# First benchmarks show a medium speed improvement, which is nice as this part is heavily called. -# -# Revision 1.13 2002/10/02 16:26:44 tipaul -# road to 1.3.1 -# -# Revision 1.12.2.4 2002/10/05 07:09:31 arensb -# Merged in changes from main branch. -# -# Revision 1.12.2.3 2002/10/05 06:12:10 arensb -# Added a whole mess of FIXME comments. -# -# Revision 1.12.2.2 2002/10/05 04:03:14 arensb -# Added some missing semicolons. -# -# Revision 1.12.2.1 2002/10/04 02:24:01 arensb -# Use C4::Connect instead of C4::Database, C4::Connect->dbh instead -# C4Connect. -# -# Revision 1.12.2.3 2002/10/05 06:12:10 arensb -# Added a whole mess of FIXME comments. -# -# Revision 1.12.2.2 2002/10/05 04:03:14 arensb -# Added some missing semicolons. -# -# Revision 1.12.2.1 2002/10/04 02:24:01 arensb -# Use C4::Connect instead of C4::Database, C4::Connect->dbh instead -# C4Connect. -# -# Revision 1.12 2002/10/01 11:48:51 arensb -# Added some FIXME comments, mostly marking duplicate functions. -# -# Revision 1.11 2002/09/24 13:49:26 tipaul -# long WAS the road to 1.3.0... -# coming VERY SOON NOW... -# modifying installer and buildrelease to update the DB -# -# Revision 1.10 2002/09/22 16:50:08 arensb -# Added some FIXME comments. -# -# Revision 1.9 2002/09/20 12:57:46 tipaul -# long is the road to 1.4.0 -# * MARCadditem and MARCmoditem now wroks -# * various bugfixes in MARC management -# !!! 1.3.0 should be released very soon now. Be careful !!! -# -# Revision 1.8 2002/09/10 13:53:52 tipaul -# MARC API continued... -# * some bugfixes -# * multiple item management : MARCadditem and MARCmoditem have been added. They suppose that ALL the MARC field linked to koha-item are in the same MARC tag (on the same line of MARC file) -# -# Note : it should not be hard for marcimport and marcexport to re-link fields from internal tag/subfield to "legal" tag/subfield. -# -# Revision 1.7 2002/08/14 18:12:51 tonnesen -# Added copyright statement to all .pl and .pm files -# -# Revision 1.6 2002/07/25 13:40:31 tipaul -# pod documenting the API. -# -# Revision 1.5 2002/07/24 16:11:37 tipaul -# Now, the API... -# Database.pm and Output.pm are almost not modified (var test...) -# -# Biblio.pm is almost completly rewritten. -# -# WHAT DOES IT ??? ==> END of Hitchcock suspens -# -# 1st, it does... nothing... -# Every old API should be there. So if MARC-stuff is not done, the behaviour is EXACTLY the same (if there is no added bug, of course). So, if you use normal acquisition, you won't find anything new neither on screen or old-DB tables ... -# -# All old-API functions have been cloned. for example, the "newbiblio" sub, now has become : -# * a "newbiblio" sub, with the same parameters. It just call a sub named OLDnewbiblio -# * a "OLDnewbiblio" sub, which is a copy/paste of the previous newbiblio sub. Then, when you want to add the MARC-DB stuff, you can modify the newbiblio sub without modifying the OLDnewbiblio one. If we correct a bug in 1.2 in newbiblio, we can do the same in main branch by correcting OLDnewbiblio. -# * The MARC stuff is usually done through a sub named MARCxxx where xxx is the same as OLDxxx. For example, newbiblio calls MARCnewbiblio. the MARCxxx subs use a MARC::Record as parameter. -# The last thing to solve was to manage biblios through real MARC import : they must populate the old-db, but must populate the MARC-DB too, without loosing information (if we go from MARC::Record to old-data then back to MARC::Record, we loose A LOT OF ROWS). To do this, there are subs beginning by "NEWxxx" : they manage datas with MARC::Record datas. they call OLDxxx sub too (to populate old-DB), but MARCxxx subs too, with a complete MARC::Record ;-) -# -# In Biblio.pm, there are some subs that permits to build a old-style record from a MARC::Record, and the opposite. There is also a sub finding a MARC-bibid from a old-biblionumber and the opposite too. -# Note we have decided with steve that a old-biblio <=> a MARC-Biblio. -# diff --git a/z3950/encodingfix/README-english b/z3950/encodingfix/README-english deleted file mode 100644 index 7f255787d8..0000000000 --- a/z3950/encodingfix/README-english +++ /dev/null @@ -1,18 +0,0 @@ -IMPORTING FROM Z39.50 SERVER WITH Character Set: win1250 (ISO 6937/2) into KOHA-2.0 WITH UTF-8 - -Files from this directory are here as a fix only and are of temporary nature. The fix was delivered to me by Zbigniew Bomart. -It will probably work for the Polish Language only. The issue needs to be addressed by Koha developers for the general audience. -There's a general problem with z39.50 import feature for koha instalations whose default charset IS NOT iso-8859-1. -When importing from z39.50 servers that keep their records in windows-1250 charset encoding and koha installation with UTF-8 one may use the replacement files in this directory. -Copy them to the following location: -/usr/local/koha/intranet/modules/C4/Biblio.pm -/usr/local/koha/intranet/cgi-bin/z3950/search.pl - -and enjoy importing records in UTF-8 from Character Set: win1250 (ISO 6937/2) servers. -I tested it and the files seem to work on Fedora Core 1 and Koha-2.0 - -Remember to set the appropriate permissions on the files once you copy them. On my machine it is: --rwxr-xr-x 1 apache apache 91813 May 2 18:34 Biblio.pm --rwxr-xr-x 1 apache apache 3263 May 2 18:39 search.pl - -Benedict P. Barszcz diff --git a/z3950/encodingfix/README-polish b/z3950/encodingfix/README-polish deleted file mode 100644 index e9d3b041f6..0000000000 --- a/z3950/encodingfix/README-polish +++ /dev/null @@ -1,18 +0,0 @@ -IMPORTOWANIE DANYCH BIBLIOGRAFICZNYCH Z SERWERA BIBLIOTEKI NARODOWEJ W KODOWANIU win1250 (ISO 6937/2) DO KOHA-2.0 Z KODOWANIEM UTF-8. - -Pliki w tym katalogu są czasowym rozwiązaniem problemu, który istnieje podczas importowania danych bibliograficznych przez sieć z biblioteki Narodowej w Warszawie. Rozwiązanie działa prawdopodobnie tylko dla języka polskiego dlatego deweloperzy Koha będą musieli coś zrobić z tym problemem w przyszłości. -Pliki z tego katalogu należy przekopiować do ich właściwego katalogu na zainstalowanym serwerze Koha-2.0: -/usr/local/koha/intranet/modules/C4/Biblio.pm -/usr/local/koha/intranet/cgi-bin/z3950/search.pl - -Po skopiowaniu należy upewnić się, że przywileje plików są właściwe. U mnie to jest: --rwxr-xr-x 1 apache apache 91813 May 2 18:34 Biblio.pm --rwxr-xr-x 1 apache apache 3263 May 2 18:39 search.pl - -Po tym zabiegu można spokojnie korzystać z serwera ( http://www.bn.org.pl/Z3950_eng.htm) INNOPAC biblioteki Narodowej w Warszawie do importu rekordów, które jakimś cudem nadal trzymają w win1250 (ISO 6937/2). - -Autorem przedstawionego rozwiązania jest Zbigniew Bomart. - -Benedykt P. Barszcz - - diff --git a/z3950/encodingfix/search.pl b/z3950/encodingfix/search.pl deleted file mode 100644 index 368a3b8c42..0000000000 --- a/z3950/encodingfix/search.pl +++ /dev/null @@ -1,110 +0,0 @@ -#!/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 2 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, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA - -use strict; -use CGI; -use C4::Auth; -use C4::Output; -use C4::Interface::CGI::Output; -use C4::Biblio; -use C4::Context; -use C4::Koha; # XXX subfield_is_koha_internal_p -use C4::Z3950; -use C4::Search; -use HTML::Template; -use MARC::File::USMARC; - -use vars qw( $tagslib ); -use vars qw( $is_a_modif ); - - -my $input = new CGI; -my $dbh = C4::Context->dbh; -my $error = $input->param('error'); -my $bibid=$input->param('bibid'); -my $title = $input->param('title'); -my $author = $input->param('author'); -my $isbn = $input->param('isbn'); -my $issn = $input->param('issn'); -my $random = $input->param('random'); -my @results; -my $count; -my $toggle; - -my $record; -my $oldbiblio; -if ($bibid > 0) { - $record = MARCgetbiblio($dbh,$bibid); - $oldbiblio = MARCmarc2koha($dbh,$record); -} -my $errmsg; -unless ($random) { # if random is a parameter => we're just waiting for the search to end, it's a refresh. - if ($isbn) { - $random =rand(1000000000); - $errmsg = addz3950queue($isbn, "isbn", $random, 'CHECKED'); - } elsif ($author) { - $random =rand(1000000000); - $errmsg = addz3950queue($author, "author", $random, 'CHECKED'); - } elsif ($title) { - $random =rand(1000000000); - $errmsg = addz3950queue($title, "title", $random, 'CHECKED'); - } -} -my ($template, $loggedinuser, $cookie) -= get_template_and_user({template_name => "z3950/searchresult.tmpl", - query => $input, - type => "intranet", - authnotrequired => 0, - flagsrequired => {catalogue => 1}, - debug => 1, - }); - -# fill with books in breeding farm -($count, @results) = breedingsearch($title,$isbn,$random); -my $numberpending= &checkz3950searchdone($random); -my @breeding_loop = (); -for (my $i=0; $i <= $#results; $i++) { - my %row_data; - if ($i % 2) { - $toggle="#ffffcc"; - } else { - $toggle="white"; - } - $row_data{toggle} = $toggle; - $row_data{id} = $results[$i]->{'id'}; - $row_data{isbn} = $results[$i]->{'isbn'}; - $row_data{file} = $results[$i]->{'file'}; - $row_data{title} = char_decode($results[$i]->{'title'}, "MARC21"); - $row_data{author} = char_decode($results[$i]->{'author'}, "MARC21"); - push (@breeding_loop, \%row_data); -} - -$template->param(isbn => $isbn, - title => $title, - author => $author, - breeding_loop => \@breeding_loop, - refresh => ($numberpending eq 0 ? 0 : "search.pl?bibid=$bibid&random=$random"), - numberpending => $numberpending, - oldbiblionumber => $oldbiblio->{'biblionumber'}, - ); - -print $input->header( --type => guesstype($template->output), --cookie => $cookie -),$template->output; diff --git a/z3950/processz3950queue b/z3950/processz3950queue deleted file mode 100755 index 5d5313ac4c..0000000000 --- a/z3950/processz3950queue +++ /dev/null @@ -1,347 +0,0 @@ -#!/usr/bin/perl - -# $Id$ -use MARC::Record; -use C4::Context; -use DBI; -use strict; -use C4::Biblio; -use C4::Output; -use C4::Breeding; -use ZOOM; - -=head1 NAME - -processz3950queue. The script that does z3950 searches. - -=head1 SYNOPSIS - -This script can be used on a console (as normal user) or by the daemon-launch script. - -Don't forget to EXPORT PERL5LIB=/PATH/to/KOHA before executing it if you use console mode. - -It : -1- extracts z3950 requests from z3950queue table, -2- creates entries in z3950results to store the result -3- launch z3950 queries in asynchronous mode, using Unix fork() -4- store results in marc_breeding table. - -The z3950 results queries are managed in z3950/search.pl script (poped-up window in MARC editor). - -=head1 DESCRIPTION - -=head2 table z3950servers - -This table stores the differents z3950 servers. -A server is used if checked=1. The rank is NOT used as searches are now asynchronous. - -=head2 table z3950queue - -Table use to manage queries. A single line is created in this table for each z3950 search request. -If more than 1 server is called, the C field containt all of them separated by |. - -z3950 search requests are done by z3950/search.pl script. -At this stage, the fields are created with C and C empty - -Then, the processz3950queue finds this entry and : -1- store date (time()) in C -2- set C = -1 - -when the requests are all sent : -2- set C = 1 -3- set C (FIXME: always equal to startdate for me) - -entries are deleted when : -- C is more than 1 day ago. - -FIXME: -- results, numrecords fields are unused - -=head2 table z3950results - -1 entry is created for each request, for each server called. -when created : -* C is filled -* C is null -* active is set to 0. when active is 0, it means the request has not been sent. when set to 1, it means it's on the way. - -When a search is ended, C is set, and C is set to -1 - -=head1 How it's written - -on every loop : -* delete old queries -* for each entry in z3950queue table that is not done=1 { - for each search request { - for each server { - try to connect - look for results - * results can be : - - existing and already running on another process (active=1) - - existing & finished (active=-1) - - non existent => create it and run the request. - } - } -} -=over 2 - -=cut - - -if ($< == 0) { - # Running as root, switch privs - if (-d "/var/run") { - open PID, ">/var/run/processz3950queue.pid"; - print PID $$."\n"; - close PID; - } - # Get real apacheuser from koha.conf or reparsing httpd.conf - my $apacheuser=C4::Context->config("httpduser"); - my $uid=0; - unless ($uid = (getpwnam($apacheuser))[2]) { - die "Attempt to run daemon as non-existent or superuser\n"; - } - $>=$uid; - $<=$uid; -} -my $db_driver = C4::Context->config("db_scheme") || "mysql"; -my $db_name = C4::Context->config("database"); -my $db_host = C4::Context->config("hostname"); -my $db_user = C4::Context->config("user"); -my $db_passwd = C4::Context->config("pass"); -my $dbh = DBI->connect("DBI:$db_driver:$db_name:$db_host",$db_user, $db_passwd); - -# we begin the script, so "unactive" every pending request : they will never give anything, the script died :-( -my $sth=$dbh->prepare("update z3950results set active=0 where active<>-1"); -$sth->execute; -$sth->finish; -$SIG{CHLD}='reap'; -$SIG{HUP}='checkqueue'; - - -my $logdir=$ARGV[0]; - -open PID, ">$logdir/processz3950queue.pid"; -print PID $$."\n"; -close PID; - -my $reapcounter=0; -my $forkcounter=0; -my $checkqueue=1; -my $pid=$$; -my $lastrun=0; -while (1) { - if ((time-$lastrun)>5) { - $checkqueue = 1; # FIXME during testing, this line forces the loop. REMOVE it to use SIG{HUP} when "daemonized" ! -# clean DB - my $now = time(); - # delete z3950queue entries that are more than 1 day old - my $sth = $dbh->prepare("delete from z3950queue where ?-startdate > 86400"); - $sth->execute($now); - # delete z3950results queries that are more than 1 hour old - $sth = $dbh->prepare("delete from z3950results where ?-startdate > 3600"); - $sth->execute($now); - if ($checkqueue) { # everytime a SIG{HUP} is recieved - $checkqueue=0; -# parse every entry in QUEUE - $sth=$dbh->prepare("select id,term,type,servers,identifier from z3950queue where done<>1 or done is null order by id"); - $sth->execute; - while (my ($id, $term, $type, $servers,$random) = $sth->fetchrow) { -# FIXME: there is no "else". So, if more than 12 requests at the same time => requests are lost ! - if ($forkcounter<12) { - my $now=time(); -# search for results entries for this request - my $stk=$dbh->prepare("select id,server,startdate,enddate,numrecords,active from z3950results where queryid=?"); - ($stk->execute($id)) || (next); - my %serverdone; -# if no results => set queue to done = -1, set startdate and begin creating z3950results table entries & z3950 queries - unless ($stk->rows) { - my $sti=$dbh->prepare("update z3950queue set done=-1,startdate=? where id=?"); - $sti->execute($now,$id); - } -# check which servers calls have already been created (before a crash) - while (my ($r_id, $r_server,$r_startdate,$r_enddate,$r_numrecords,$active) = $stk->fetchrow) { - if ($r_enddate >0) { # result entry exist & finished - $serverdone{$r_server}=1; - } elsif ($active) { # result entry exists & on the way (active=1) or already done (active=-1) - $serverdone{$r_server}=1; - } else { # otherwise - $serverdone{$r_server}=-1; - } - # note that is the entry doesn't exist, the $serverdone{$r_server} is 0 (important later !) - } - $stk->finish; - foreach my $serverinfo (split(/\|/, $servers)) { - (next) if ($serverdone{$serverinfo} == 1); #(otherwise, is 0 or -1) - my $totalrecords=0; - my $globalname; - my $globalsyntax; - my $globalencoding; -# fork a process for this z3950 query - if (my $pid=fork()) { - $forkcounter++; - } else { -# and connect to z3950 server -#FIXME: why do we need $dbi ? can't we use $dbh ? - my $db_driver = C4::Context->config("db_scheme") || "mysql"; - my $db_name = C4::Context->config("database"); - my $db_host = C4::Context->config("hostname"); - my $db_user = C4::Context->config("user"); - my $db_passwd = C4::Context->config("pass"); - my $dbi = DBI->connect("DBI:$db_driver:$db_name:$db_host",$db_user, $db_passwd); - $dbh->{"InactiveDestroy"} = "true"; - my ($name, $server, $database, $user, $password,$syntax) = split(/\//, $serverinfo, 6); - $globalname=$name; - $globalsyntax = $syntax; - $server=~/(.*)\:(\d+)/; - my $servername=$1; - my $port=$2; - my $attr=''; - if ($type eq 'isbn') { - $attr='1=7'; - } elsif ($type eq 'title') { - $attr='1=4'; - } elsif ($type eq 'author') { - $attr='1=1003'; - } elsif ($type eq 'lccn') { - $attr='1=9'; - } elsif ($type eq 'keyword') { - $attr='1=1016'; - } - my $query = "\@attr $attr \"$term\""; - print "$$/$id : Processing $type=$term at $name $server $database $syntax (".($forkcounter+1)." forks)\n"; -# try to connect - my $conn; - my $noconnection=0; - my $error=0; -# the z3950 query is builded. Launch it. - if ($user) { - $conn= new ZOOM::Connection($servername, $port, databaseName => $database, user => $user, password => $password) || ($noconnection=1); - } else { - $conn= new ZOOM::Connection($servername, $port, databaseName => $database) || ($noconnection=1); - } - if ($noconnection || $error) { -# if connection impossible, don't go further ! - print "$$/$id : no connection at $globalname\n"; - my $result = MARC::Record->new(); - my ($notmarcrecord,$alreadyindb,$alreadyinfarm,$imported) = ImportBreeding($result,-1,"$globalname server is NOT responding","",$random); - } else { -# else, build z3950 query and do it ! - $now=time(); - my $resultsid=""; - # create z3950results entries. - if ($serverdone{$serverinfo}==-1) { # if entry exist, just retrieve it - my $stj=$dbi->prepare("select id from z3950results where server=? and queryid=?"); - $stj->execute($serverinfo,$id); - ($resultsid) = $stj->fetchrow; - $stj->finish; - print "$$/$id : 1 >> $resultsid\n"; - } else { # else create it : (may be serverdone=1 or 0) - my $stj=$dbi->prepare("select id from z3950results where server=? and queryid=?"); - $stj->execute($serverinfo,$id); - ($resultsid) = $stj->fetchrow; - $stj->finish; - print "$$/$id : 2 >> $resultsid\n"; - unless ($resultsid) { - $stj=$dbi->prepare("insert into z3950results (server, queryid, startdate) values (?,?,?)"); - $stj->execute($serverinfo, $id, $now); - $resultsid=$dbi->{'mysql_insertid'}; - $stj->finish; - print "$$/$id : creating and "; - } - } - print "$$/$id : working on results entry $resultsid\n"; - # set active to 1 => this request is on the way. - my $stj=$dbi->prepare("update z3950results set active=1 where id=?"); - $stj->execute($resultsid); -####### - print "$$/$id : connected to $globalname\n"; - print "Global Syntax =>".$globalsyntax."<="; - eval {$conn->option(elementSetName => 'F')}; - eval { $conn->option(preferredRecordSyntax => 'USMARC');} if ($globalsyntax eq "USMARC"); - eval { $conn->option(preferredRecordSyntax => 'UNIMARC');} if ($globalsyntax eq "UNIMARC"); - if ($@) { - print "$$/$id : $globalname ERROR: $@ for $resultsid\n"; - # in case pb during connexion, set result to "empty" to avoid everlasting loops - my $stj=$dbi->prepare("update z3950results set numrecords=?,numdownloaded=?,highestseen=0,results='',enddate=? where id=?"); - $stj->execute(0,0,$now,$resultsid); - } else { - my $rs=$conn->search_pqf($query) or warn "Connection Problem:".$conn->errmsg(); - pe(); - # we have an answer for a query => get results & store them in marc_breeding table - my $numresults=$rs->size(); - if ($numresults eq 0) { - print "$$/$id : $globalname : no records found\n"; - } else { - print "$$/$id : $globalname : $numresults records found, retrieving them (max 80)\n"; - } - pe(); - my $i; - my $result=''; - my $scantimerstart=time(); - for ($i=1; $i<=(($numresults<80) ? ($numresults) : (80)); $i++) { - my $rec=$rs->record($i-1); - my $marcdata = $rec->raw(); - #my $marcrecord = MARC::Record->new_from_usmarc($marcdata); - #warn $marcrecord->as_formatted(); - $globalencoding = ref($rec); - $result.=$marcdata; - } - my @x=split /::/,$globalencoding; - my ($notmarcrecord,$alreadyindb,$alreadyinfarm,$imported) = ImportBreeding($result,-1,"Z3950-$globalname",$x[3],$random); - my $scantimerend=time(); - my $numrecords; - ($numresults<80) ? ($numrecords=$numresults) : ($numrecords=80); - my $elapsed=$scantimerend-$scantimerstart; - if ($elapsed) { - my $speed=int($numresults/$elapsed*100)/100; - print "$$/$id : $globalname : $server records retrieved $numrecords SPEED: $speed\n"; - } - my $q_result=$dbi->quote($result); - ($q_result) || ($q_result='""'); - $now=time(); - if ($numresults >0) { - my $stj=$dbi->prepare("update z3950results set numrecords=?,numdownloaded=?,highestseen=0,results=?,enddate=? where id=?"); - $stj->execute($numresults,$numrecords,$q_result,$now,$resultsid); - } else { # no results... - my $stj=$dbi->prepare("update z3950results set numrecords=?,numdownloaded=?,highestseen=0,results='',enddate=? where id=?"); - $stj->execute($numresults,$numrecords,$now,$resultsid); - } - } - $stj=$dbi->prepare("update z3950results set active=-1 where id=?"); - $stj->execute($resultsid); - eval {my $stj->finish}; - } -#OK, the search is done inactivate it.. - print "$$/$id : $server search done.\n"; - exit; - } - } - } else { -# $forkcounter >=12 - } - # delete z3950queue entry, as everything is done - my $sti=$dbh->prepare("update z3950queue set done=1,enddate=? where id=?"); - $now=time(); - $sti->execute($now,$id); - } - $lastrun=time(); - } - sleep 10; - } -} - -sub reap { - $forkcounter--; - wait; -} - - -sub checkqueue { - $checkqueue=1; -} - - -sub pe { - return 0; -} diff --git a/z3950/search.pl b/z3950/search.pl index a63870f359..8864da50f6 100755 --- a/z3950/search.pl +++ b/z3950/search.pl @@ -19,94 +19,210 @@ use strict; use CGI; + use C4::Auth; use C4::Output; use C4::Interface::CGI::Output; use C4::Biblio; use C4::Context; -use C4::Koha; # XXX subfield_is_koha_internal_p -use C4::Z3950; -use C4::Search; use C4::Breeding; -use HTML::Template; use MARC::File::USMARC; - -use vars qw( $tagslib ); -use vars qw( $is_a_modif ); - +use ZOOM; +use Encode;; my $input = new CGI; my $dbh = C4::Context->dbh; my $error = $input->param('error'); -my $bibid=$input->param('bibid'); +my $oldbiblionumber=$input->param('oldbiblionumber'); +$oldbiblionumber=0 unless $oldbiblionumber; my $title = $input->param('title'); my $author = $input->param('author'); my $isbn = $input->param('isbn'); my $issn = $input->param('issn'); my $random = $input->param('random'); +my $op=$input->param('op'); +my $noconnection; +my $numberpending; +my $attr=''; +my $term; +my $host; +my $server; +my $database; +my $port; +my $marcdata; +my $encoding=C4::Context->preference("marcflavour"); my @results; my $count; my $toggle; - +my @breeding_loop = (); my $record; -my $biblionumber; -if ($bibid > 0) { - $record = MARCgetbiblio($dbh,$bibid); - $biblionumber=MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid); -} - +my $oldbiblio; +my $dbh = C4::Context->dbh; my $errmsg; +my @serverloop=(); +my @serverhost; unless ($random) { # if random is a parameter => we're just waiting for the search to end, it's a refresh. - if ($isbn) { - $random =rand(1000000000); - $errmsg = addz3950queue($isbn, "isbn", $random, 'CHECKED'); - } elsif ($author) { - $random =rand(1000000000); - $errmsg = addz3950queue($author, "author", $random, 'CHECKED'); - } elsif ($title) { - $random =rand(1000000000); - $errmsg = addz3950queue($title, "title", $random, 'CHECKED'); - } +$random =rand(1000000000); } -my ($template, $loggedinuser, $cookie) + + +my ($template, $loggedinuser, $cookie); +if ($op ne "do_search"){ + +my $sth=$dbh->prepare("select id,host,checked from z3950servers order by host"); +$sth->execute(); +while ($server=$sth->fetchrow_hashref) { +my %temploop; +$temploop{server}=$server->{host}; +$temploop{id}=$server->{id}; +$temploop{checked}=$server->{checked}; +push (@serverloop, \%temploop); +} +($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "z3950/searchresult.tmpl", query => $input, type => "intranet", - authnotrequired => 0, + authnotrequired => 1, flagsrequired => {catalogue => 1}, debug => 1, }); +$template->param(isbn=>$isbn, issn=>$issn,title=>$title,author=>$author, + serverloop => \@serverloop, + opsearch => "search", + oldbiblionumber => $oldbiblionumber, + ); +output_html_with_http_headers $input, $cookie, $template->output; -# fill with books in breeding farm -($count, @results) = BreedingSearch($title,$isbn,$random); -my $numberpending= &checkz3950searchdone($random); -my @breeding_loop = (); -for (my $i=0; $i <= $#results; $i++) { - my %row_data; +}else{ + +my @id=$input->param('id'); +my @oConnection; +my @oResult; +my $s=0; + if ($isbn ne "/" || $issn ne "/") { + $attr='1=7'; + $term=$isbn if ($isbn ne"/"); + $term=$issn if ($issn ne"/"); + } elsif ($title ne"/") { + $attr='1=4 @attr 4=1 '; + $term=$title; + } elsif ($author ne "/") { + $attr='1=1003'; + $term=$author; + } + + +my $query="\@attr $attr \"$term\""; + + foreach my $servid ( @id){ + my $sth=$dbh->prepare("select name, port, db, host from z3950servers where id=?"); + $sth->execute($servid); + + while ($server=$sth->fetchrow_hashref) { + my $noconnection=0; + #$numberpending=1; + + my $option1=new ZOOM::Options(); + $option1->option(async=>1); + $option1->option('elementSetName', 'F'); + $option1->option('databaseName',$server->{db}) ; + $option1->option('preferredRecordSyntax', 'USMARC'); + $oConnection[$s]=create ZOOM::Connection($option1); + $oConnection[$s]->connect($server->{name}, $server->{port}); + $serverhost[$s]=$server->{host}; + $s++; + }## while fetch + + }# foreach +my $nremaining = $s; +my $firstresult=1; + for (my $z=0 ;$z<$s;$z++){ +$oResult[$z] = $oConnection[$z]->search_pqf($query); + +} +AGAIN: + my $k; +my $event; + while (($k = ZOOM::event(\@oConnection)) != 0) { + $event = $oConnection[$k-1]->last_event(); +# warn ("connection ", $k-1, ": event $event (", ZOOM::event_str($event), ")\n"); + last if $event == ZOOM::Event::ZEND; + } +if ($k != 0) { + $k--; +#warn $serverhost[$k]; + my($error, $errmsg, $addinfo, $diagset) = $oConnection[$k]->error_x(); + if ($error) { + + warn "$k $serverhost[$k] error $query: $errmsg ($error) $addinfo\n"; + goto MAYBE_AGAIN; + } + + my $numresults=$oResult[$k]->size() ; + + + my $i; + my $result=''; + if ($numresults>0){ + for ($i=0; $i<(($numresults<5) ? ($numresults) : (5)) ; $i++) { + my $rec=$oResult[$k]->record($i); + my $marcrecord; + $marcdata = $rec->raw(); + $marcrecord = MARC::File::USMARC::decode($marcdata); + + my $marcxml=$marcrecord->as_xml_record($marcrecord); + $marcxml=Encode::encode('utf8',$marcxml); + #$marcxml=Encode::decode('utf8',$marcxml); + my $xmlhash=XML_xml2hash_onerecord($marcxml); + my $oldbiblio = XMLmarc2koha_onerecord($dbh,$xmlhash,'biblios'); + $oldbiblio->{isbn} =~ s/ |-|\.//g, + $oldbiblio->{isbn} = substr($oldbiblio->{isbn},0,10); + $oldbiblio->{issn} =~ s/ |-|\.//g, + $oldbiblio->{issn} = substr($oldbiblio->{issn},0,10); + +my ($notmarcrecord,$alreadyindb,$alreadyinfarm,$imported,$bid)=ImportBreeding($marcdata,1,$serverhost[$k],$encoding,$random); + my %row_data; + @breeding_loop = (); if ($i % 2) { $toggle="#ffffcc"; } else { $toggle="white"; } $row_data{toggle} = $toggle; - $row_data{id} = $results[$i]->{'id'}; - $row_data{isbn} = $results[$i]->{'isbn'}; - $row_data{file} = $results[$i]->{'file'}; - $row_data{title} = $results[$i]->{'title'}; - $row_data{author} = $results[$i]->{'author'}; + $row_data{server} = $serverhost[$k]; + $row_data{isbn} = $oldbiblio->{isbn}; + + $row_data{title} =$oldbiblio->{title}; + $row_data{author} = $oldbiblio->{author}; + $row_data{id} = $bid; + $row_data{oldbiblionumber}=$oldbiblionumber; push (@breeding_loop, \%row_data); -} -$template->param(isbn => $isbn, - title => $title, - author => $author, + +}# $numresults +}#for up to 5 results +}# if $k !=0 + +my ($template, $loggedinuser, $cookie) += get_template_and_user({template_name => "z3950/searchresult.tmpl", + query => $input, + type => "intranet", + authnotrequired => 1, + flagsrequired => {catalogue => 1}, + debug => 1, + }); +$numberpending=$nremaining-1; +$template->param( breeding_loop => \@breeding_loop, - refresh => ($numberpending eq 0 ? "" : "search.pl?bibid=$bibid&random=$random"), +# refresh=>($numberpending eq 0 ? "" : "search.pl?random=$random"), numberpending => $numberpending, - oldbiblionumber => $oldbiblio->{'biblionumber'}, +# oldbiblionumber => $oldbiblionumber, ); - -print $input->header( --type => guesstype($template->output), --cookie => $cookie -),$template->output; +output_html_with_http_headers $input, "", $template->output if $firstresult==1; +$firstresult++; +print $template->output if $firstresult !=1; +MAYBE_AGAIN: +if (--$nremaining > 0) { + goto AGAIN; +} +} ## if op=search diff --git a/z3950/server/zed-koha-server.pl b/z3950/server/zed-koha-server.pl deleted file mode 100755 index a315dfdb08..0000000000 --- a/z3950/server/zed-koha-server.pl +++ /dev/null @@ -1,313 +0,0 @@ -#!/usr/bin/perl -w -# -# 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 2 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, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA -# -#----------------------------------- -# Script Name: zed-koha-server.pl -# Script Version: 1.4 -# Date: 2004/06/02 -# Author: Joshua Ferraro [jmf at kados dot org] -# Description: A very basic Z3950 Server -# Usage: zed-koha-server.pl -# Revision History: -# 0.00 2003/08/14: Original version; search works. -# 0.01 2003/10/02: First functional version; search and fetch working -# records returned in USMARC (ISO2709) format, -# Bath compliant to Level 1 in Functional Areas A, B. -# 0.02 2004/04/14: Cleaned up documentation, etc. No functional -# changes. -# 1.30 2004/04/22: Changing version numbers to correspond with CVS; -# Fixed the substitution bug (e.g., 4=100 before 4=1); -# Added support for the truncation attribute (5=1 and -# 5=100; thanks to Tomasz M. Wolniewicz for pointing -# out these improvements) -# 1.4.0 2004/06/02: Changed sql queries to account for the difference -# between bibid and biblionumber. Thanks again to -# Tomasz M. Wolniewicz for suggesting a great solution -# to this problem. -#----------------------------------- -# Note: After installing SimpleServer (indexdata.dk/simpleserver) and -# changing the leader information in Koha's MARCgetbiblio subroutine in -# Biblio.pm you can run this script as root: -# -# ./zed-koha-server.pl -# -# and the server will start running on port 9999 and will allow searching -# and retrieval of records in MARC21 (USMARC; ISO2709) bibliographic format. -# ---------------------------------- -use DBI; -use Net::Z3950::OID; -use Net::Z3950::SimpleServer; -use MARC::Record; -use C4::Context; -use C4::Biblio; -use strict; -# my $dbh = C4::Context->dbh; -my @bib_list; ## Stores the list of biblionumbers in a query - ## I should eventually move this to different scope - -my $handler = Net::Z3950::SimpleServer->new(INIT => \&init_handler, - SEARCH => \&search_handler, - FETCH => \&fetch_handler); - -$handler->launch_server("zed-koha-server.pl", @ARGV); - -sub init_handler { - my $args = shift; - my $session = {}; - - # FIXME: I should force use of my database name - $args->{IMP_NAME} = "Zed-Koha"; - $args->{IMP_VER} = "1.40"; - $args->{ERR_CODE} = 0; - $args->{HANDLE} = $session; - if (defined($args->{PASS}) && defined($args->{USER})) { - printf("Received USER/PASS=%s/%s\n", $args->{USER},$args->{PASS}); - } - -} - - -sub run_query { ## Run the query and store the biblionumbers: - my ($sql_query, $query, $args) = @_; - my $dbh = C4::Context->dbh; - my $sth_get = $dbh->prepare("$sql_query"); - - ## Send the query to the database: - $sth_get->execute($query); - my $count = 0; - while(my ($data)=$sth_get->fetchrow_array) { - - ## Store Biblioitem info for later - $bib_list[$count] = "$data"; - - ## Implement count: - $count ++; - } - $args->{HITS} = $count; - print "got search: ", $args->{RPN}->{query}->render(), "\n"; -} - -sub search_handler { - my($args) = @_; - ## Place the user's query into a variable - my $query = $args->{QUERY}; - - ## The actual Term - my $term = $args->{term}; - $term =~ s| |\%|g; - $term .= "\%"; ## Add the wildcard to search term - - $_ = "$query"; - - ## Strip out the junk and call the mysql query subroutine: - if (/1=7/) { ## isbn - $query =~ s|\@attrset 1.2.840.10003.3.1 \@attr 1=7 ||g; - $query =~ s|"||g; - $query =~ s| |%|g; - - ## Bib-1 Structure Attributes: - $query =~ s|\@attr||g; - - $query =~ s|4=100||g; ## date (un-normalized) - $query =~ s|4=101||g; ## name (normalized) - $query =~ s|4=102||g; ## sme (un-normalized) - $query =~ s|4=1||g; ## Phrase - $query =~ s|4=2||g; ## Keyword - $query =~ s|4=3||g; ## Key - $query =~ s|4=4||g; ## year - $query =~ s|4=5||g; ## Date (normalized) - $query =~ s|4=6||g; ## word list - $query =~ s|5=100||g; ## truncation - $query =~ s|5=1||g; ## truncation - $query =~ s|\@and ||g; - $query =~ s|2=3||g; - - $query =~ s|,|%|g; ## replace commas with wildcard - $query .= "\%"; ## Add the wildcard to search term - $query .= "\%"; ## Add the wildcard to search term - print "The term was:\n"; - print "$term\n"; - print "The query was:\n"; - print "$query\n"; - my $sql_query = "SELECT marc_biblio.bibid FROM marc_biblio RIGHT JOIN biblioitems ON marc_biblio.biblionumber = biblioitems.biblionumber WHERE biblioitems.isbn LIKE ?"; - &run_query($sql_query, $query, $args); - - } - elsif (/1=1003/) { ## author - $query =~ s|\@attrset||g; - $query =~ s|1.2.840.10003.3.1||g; - $query =~ s|1=1003||g; - - ## Bib-1 Structure Attributes: - $query =~ s|\@attr ||g; - - $query =~ s|4=100||g; ## date (un-normalized) - $query =~ s|4=101||g; ## name (normalized) - $query =~ s|4=102||g; ## sme (un-normalized) - $query =~ s|4=1||g; ## Phrase - $query =~ s|4=2||g; ## Keyword - $query =~ s|4=3||g; ## Key - $query =~ s|4=4||g; ## year - $query =~ s|4=5||g; ## Date (normalized) - $query =~ s|4=6||g; ## word list - $query =~ s|5=100||g; ## truncation - $query =~ s|5=1||g; ## truncation - - $query =~ s|2=3||g; - $query =~ s|"||g; - $query =~ s| |%|g; - $query .= "\%"; ## Add the wildcard to search term - print "$query\n"; - my $sql_query = "SELECT marc_biblio.bibid FROM marc_biblio RIGHT JOIN biblio ON marc_biblio.biblionumber = biblio.biblionumber WHERE biblio.author LIKE ?"; - &run_query($sql_query, $query, $args); -## used for debugging--works! -## print "@bib_list\n"; - } - elsif (/1=4/) { ## title - $query =~ s|\@attrset||g; - $query =~ s|1.2.840.10003.3.1||g; - $query =~ s|1=4||g; - $query =~ s|"||g; - $query =~ s| |%|g; - - ## Bib-1 Structure Attributes: - $query =~ s|\@attr||g; - - $query =~ s|4=100||g; ## date (un-normalized) - $query =~ s|4=101||g; ## name (normalized) - $query =~ s|4=102||g; ## sme (un-normalized) - $query =~ s|4=1||g; ## Phrase - $query =~ s|4=2||g; ## Keyword - $query =~ s|4=3||g; ## Key - $query =~ s|4=4||g; ## year - $query =~ s|4=5||g; ## Date (normalized) - $query =~ s|4=6||g; ## word list - $query =~ s|5=100||g; ## truncation - $query =~ s|5=1||g; ## truncation - - $query =~ s|2=3||g; - #$query =~ s|\@and||g; - $query .= "\%"; ## Add the wildcard to search term - print "The term was:\n"; - print "$term\n"; - print "The query was:\n"; - print "$query\n"; - my $sql_query = "SELECT marc_biblio.bibid FROM marc_biblio RIGHT JOIN biblio ON marc_biblio.biblionumber = biblio.biblionumber WHERE biblio.title LIKE ?"; - &run_query($sql_query, $query, $args); - } - elsif (/1=21/) { ## subject - $query =~ s|\@attrset 1.2.840.10003.3.1 \@attr 1=21 ||g; - $query =~ s|"||g; - $query =~ s| |%|g; - - ## Bib-1 Structure Attributes: - $query =~ s|\@attr ||g; - $query =~ s|4=100||g; ## date (un-normalized) - $query =~ s|4=101||g; ## name (normalized) - $query =~ s|4=102||g; ## sme (un-normalized) - - $query =~ s|4=1||g; ## Phrase - $query =~ s|4=2||g; ## Keyword - $query =~ s|4=3||g; ## Key - $query =~ s|4=4||g; ## year - $query =~ s|4=5||g; ## Date (normalized) - $query =~ s|4=6||g; ## word list - $query =~ s|5=100||g; ## truncation - $query =~ s|5=1||g; ## truncation - - $query .= "\%"; ## Add the wildcard to search term - print "$query\n"; - my $sql_query = "SELECT marc_biblio.bibid FROM marc_biblio RIGHT JOIN biblio ON marc_biblio.biblionumber = biblio.biblionumber WHERE biblio.subject LIKE ?"; - &run_query($sql_query, $query, $args); - } - elsif (/1=1016/) { ## any - $query =~ s|\@attrset 1.2.840.10003.3.1 \@attr 1=1016 ||g; - $query =~ s|"||g; - $query =~ s| |%|g; - - ## Bib-1 Structure Attributes: - $query =~ s|\@attr||g; - - $query =~ s|4=100||g; ## date (un-normalized) - $query =~ s|4=101||g; ## name (normalized) - $query =~ s|4=102||g; ## sme (un-normalized) - - $query =~ s|4=1||g; ## Phrase - $query =~ s|4=2||g; ## Keyword - $query =~ s|4=3||g; ## Key - $query =~ s|4=4||g; ## year - $query =~ s|4=5||g; ## Date (normalized) - $query =~ s|4=6||g; ## word list - $query =~ s|5=100||g; ## truncation - $query =~ s|5=1||g; ## truncation - - $query .= "\%"; ## Add the wildcard to search term - print "$query\n"; - my $sql_query = "SELECT bibid FROM marc_word WHERE word LIKE?"; - &run_query($sql_query, $query, $args); - } -} -sub fetch_handler { - my ($args) = @_; - # warn "in fetch_handler"; ## troubleshooting - my $offset = $args->{OFFSET}; - $offset -= 1; ## because $args->{OFFSET} 1 = record #1 - chomp (my $bibid = $bib_list[$offset]); ## Not sure about this - ## print "the bibid is:$bibid\n"; - my $dbh = C4::Context->dbh; - my $MARCRecord = &MARCgetbiblio($dbh,$bibid); - $MARCRecord->leader(' nac 22 1u 4500'); - ## Set the REP_FORM - $args->{REP_FORM} = &Net::Z3950::OID::unimarc; - - ## Return the record string to the client - $args->{RECORD} = $MARCRecord->as_usmarc(); -# $args->{RECORD} = $recordstringdone; - -} - - -## This stuff doesn't work yet...I should include boolean searching someday -## though -package Net::Z3950::RPN::Term; -sub render { - my $self = shift; - return '"' . $self->{term} . '"'; -} - -package Net::Z3950::RPN::And; -sub render { - my $self = shift; - return '(' . $self->[0]->render() . ' AND ' . - $self->[1]->render() . ')'; -} - -package Net::Z3950::RPN::Or; -sub render { - my $self = shift; - return '(' . $self->[0]->render() . ' OR ' . - $self->[1]->render() . ')'; -} - -package Net::Z3950::RPN::AndNot; -sub render { - my $self = shift; - return '(' . $self->[0]->render() . ' ANDNOT ' . - $self->[1]->render() . ')'; -} diff --git a/z3950/z3950-daemon-launch.sh b/z3950/z3950-daemon-launch.sh deleted file mode 100755 index cbb4ed0042..0000000000 --- a/z3950/z3950-daemon-launch.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh - -# $Id$ - -# Script to start Koha background Z39.50 search daemon - -# Part of the Koha Library Mgmt System - www.koha.org -# Licensed under the GPL - -#---------------------------- -# Call this script during system startup, such as from rc.local - -# Bugs/To Do: -# Needs SysV-type start/stop options - -#---------------------------- -. $(dirname $0)/z3950-daemon-options -export KohaZ3950Dir - -#---------------------------- -if [ ! -d $KohaZ3950Dir ] -then - echo ERROR: Cannot find Koha directory $KohaZ3950Dir - exit 1 -fi - -KohaZ3950Shell=$KohaZ3950Dir/z3950-daemon-shell.sh - -if [ ! -x $KohaZ3950Shell ] -then - echo ERROR: Cannot find Koha Z39.50 daemon launcher $KohaZ3950Shell - exit 1 -fi - -su -c $KohaZ3950Shell - $RunAsUser & - -exit - -#-------------- -# $Log$ -# Revision 1.6 2005/10/26 09:13:54 tipaul -# big commit, still breaking things... -# -# * synch with rel_2_2. Probably the last non manual synch, as rel_2_2 should not be modified deeply. -# * code cleaning (cleaning warnings from perl -w) continued -# -# Revision 1.4.4.1 2005/06/27 23:10:55 hdl -# Removing -s from su call after Thomas D reports it breaks FreeBSD -# -# Revision 1.4 2003/11/05 23:33:45 slef -# Now figures out what directory the scripts are in -# -# Revision 1.3 2003/10/06 09:10:39 slef -# Removing config info from z3950*sh and using C4::Context in processz3950queue (Fixed bug 39) -# -# Revision 1.2 2003/04/29 16:48:25 tipaul -# really proud of this commit :-) -# z3950 search and import seems to works fine. -# Let me explain how : -# * a "search z3950" button is added in the addbiblio template. -# * when clicked, a popup appears and z3950/search.pl is called -# * z3950/search.pl calls addz3950search in the DB -# * the z3950 daemon retrieve the records and stores them in z3950results AND in marc_breeding table. -# * as long as there as searches pending, the popup auto refresh every 2 seconds, and says how many searches are pending. -# * when the user clicks on a z3950 result => the parent popup is called with the requested biblio, and auto-filled -# -# Note : -# * character encoding support : (It's a nightmare...) In the z3950servers table, a "encoding" column has been added. You can put "UNIMARC" or "USMARC" in this column. Depending on this, the char_decode in C4::Biblio.pm replaces marc-char-encode by an iso 8859-1 encoding. Note that in the breeding import this value has been added too, for a better support. -# * the marc_breeding and z3950* tables have been modified : they have an encoding column and the random z3950 number is stored too for convenience => it's the key I use to list only requested biblios in the popup. -# -# Revision 1.1 2002/11/22 10:15:22 tipaul -# moving z3950 related scripts to specific dir -# -# Revision 1.3 2002/07/02 22:08:50 tonnesen -# merging changes from rel-1-2 -# -# Revision 1.1.2.3 2002/06/26 19:56:57 tonnesen -# Bug fix. Single quotes were causing $KohaZ3950Shell variable to not get -# expanded -# -# Revision 1.1.2.2 2002/06/26 16:25:51 amillar -# Make directory variable name more explanatory -# diff --git a/z3950/z3950-daemon-shell.sh b/z3950/z3950-daemon-shell.sh deleted file mode 100755 index 519fe80686..0000000000 --- a/z3950/z3950-daemon-shell.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh - -# $Id$ - -# Script to start Koha background Z39.50 search daemon - -# Part of the Koha Library Mgmt System - www.koha.org -# Licensed under the GPL - -#---------------------------- -# Do NOT run this script directly from system startup-- this should not run as root -# Call z3950-daemon-launch.sh instead - -#---------------------------- -. $(dirname $0)/z3950-daemon-options - -#---------------------------- -LOGFILE=$LogDir/z3950-daemon-`date +%Y%m%d-%H%M`.log - -touch $LOGFILE -if [ ! -w $LOGFILE ] -then - echo ERROR: Cannot write to log file $LOGFILE - exit 1 -fi - -KohaZ3950Script=$KohaZ3950Dir/processz3950queue -if [ ! -x $KohaZ3950Script ] -then - echo ERROR: Cannot find Koha Z39.50 daemon script $KohaZ3950Script - exit 1 -fi - -PERL5LIB=$KohaModuleDir -export PERL5LIB - -KOHA_CONF=$KohaConf -export KOHA_CONF - -exec $KohaZ3950Script $LogDir >>$LOGFILE 2>&1 - -#------------------- -# $Log$ -# Revision 1.5 2003/11/05 23:33:45 slef -# Now figures out what directory the scripts are in -# -# Revision 1.4 2003/10/20 19:16:50 slef -# Work on install bugs (see bug 632) -# -# Revision 1.3 2003/10/06 09:10:39 slef -# Removing config info from z3950*sh and using C4::Context in processz3950queue (Fixed bug 39) -# -# Revision 1.2 2003/04/29 16:48:25 tipaul -# really proud of this commit :-) -# z3950 search and import seems to works fine. -# Let me explain how : -# * a "search z3950" button is added in the addbiblio template. -# * when clicked, a popup appears and z3950/search.pl is called -# * z3950/search.pl calls addz3950search in the DB -# * the z3950 daemon retrieve the records and stores them in z3950results AND in marc_breeding table. -# * as long as there as searches pending, the popup auto refresh every 2 seconds, and says how many searches are pending. -# * when the user clicks on a z3950 result => the parent popup is called with the requested biblio, and auto-filled -# -# Note : -# * character encoding support : (It's a nightmare...) In the z3950servers table, a "encoding" column has been added. You can put "UNIMARC" or "USMARC" in this column. Depending on this, the char_decode in C4::Biblio.pm replaces marc-char-encode by an iso 8859-1 encoding. Note that in the breeding import this value has been added too, for a better support. -# * the marc_breeding and z3950* tables have been modified : they have an encoding column and the random z3950 number is stored too for convenience => it's the key I use to list only requested biblios in the popup. -# -# Revision 1.1 2002/11/22 10:15:22 tipaul -# moving z3950 related scripts to specific dir -# -# Revision 1.3 2002/07/02 22:08:50 tonnesen -# merging changes from rel-1-2 -# -# Revision 1.1.2.3 2002/06/28 17:45:39 tonnesen -# z3950queue now listens for a -HUP signal before processing the queue. Z3950.pm -# sends the -HUP signal when queries are added to the queue. -# -# Revision 1.1.2.2 2002/06/26 16:25:51 amillar -# Make directory variable name more explanatory -# -- 2.39.5