X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FZ3950.pm;h=731df9930934e883f129e1b369f52b2de85e91e8;hb=fe99800a2e39fba1c6369bdfe3f600119308514a;hp=ecc3392023534bd5e015117cf1cb0b2ffbf91f5d;hpb=2e0798336711ddbf7ca5e35766686d34ea01db68;p=koha_fer diff --git a/C4/Z3950.pm b/C4/Z3950.pm index ecc3392023..731df99309 100644 --- a/C4/Z3950.pm +++ b/C4/Z3950.pm @@ -7,7 +7,6 @@ package C4::Z3950; # Licensed under the GPL - # Copyright 2000-2002 Katipo Communications # # This file is part of Koha. @@ -21,11 +20,12 @@ package C4::Z3950; # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. use strict; +#use warnings; FIXME - Bug 2505 # standard or CPAN modules used use DBI; @@ -34,14 +34,20 @@ use DBI; use C4::Input; use C4::Biblio; -#------------------ - -require Exporter; - use vars qw($VERSION @ISA @EXPORT); -# set the version for version checking -$VERSION = 3.00; +BEGIN { + # set the version for version checking + $VERSION = 3.01; + require Exporter; + @ISA = qw(Exporter); + @EXPORT = qw( + &getz3950servers + &z3950servername + &addz3950queue + &checkz3950searchdone + ); +} =head1 NAME @@ -60,17 +66,6 @@ entering Z39.50 lookup requests. =over 2 -=cut - -@ISA = qw(Exporter); -@EXPORT = qw( - &getz3950servers - &z3950servername - &addz3950queue - &checkz3950searchdone -); - -#------------------------------------------------ =item getz3950servers @servers= &getz3950servers(checked); @@ -81,6 +76,7 @@ C<$checked> should always be true (1) => returns only active servers. If 0 => returns all servers =cut + sub getz3950servers { my ($checked) = @_; my $dbh = C4::Context->dbh; @@ -109,6 +105,7 @@ C<$server_id> is the Z39.50 server ID to look up. C<$dbh> is ignored. =cut + #' sub z3950servername { @@ -164,6 +161,7 @@ C<&addz3950queue> returns an error message. If it was successful, the error message is the empty string. =cut + #' sub addz3950queue { use strict; @@ -234,7 +232,6 @@ sub addz3950queue { # spawn a separate 'cat' process. my $pid=`cat $pidfile`; chomp $pid; - warn "PID : $pid"; # Kill -HUP the Z39.50 daemon to tell it to process # this query. my $processcount=kill 1, $pid; @@ -274,6 +271,7 @@ Returns the number of pending z3950 requests C<$random> is the random z3950 query number. =cut + sub checkz3950searchdone { my ($z3950random) = @_; my $dbh = C4::Context->dbh; @@ -298,81 +296,6 @@ __END__ =head1 AUTHOR -Koha Developement team +Koha Development Team =cut - -#-------------------------------------- -# Revision 1.14 2007/03/09 14:31:47 tipaul -# rel_3_0 moved to HEAD -# -# Revision 1.10.10.1 2006/12/22 15:09:54 toins -# removing C4::Database; -# -# Revision 1.10 2003/10/01 15:08:14 tipaul -# fix fog bug #622 : processz3950queue fails -# -# Revision 1.9 2003/04/29 16:50:51 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 import_batches/import_records/import_biblios tables. -# * 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 mport_records 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.8 2003/04/29 08:09:45 tipaul -# z3950 support is coming... -# * adding a syntax column in z3950 table = this column will say wether the z3950 must be called with PerferedRecordsyntax => USMARC or PerferedRecordsyntax => UNIMARC. I tried some french UNIMARC z3950 servers, and some only send USMARC, some only UNIMARC, some can answer with both. -# Note this is a 1st draft. More to follow (today ? I hope). -# -# Revision 1.7 2003/02/19 01:01:06 wolfpac444 -# Removed the unecessary $dbh argument from being passed. -# Resolved a few minor FIXMEs. -# -# Revision 1.6 2002/10/13 08:30:53 arensb -# Deleted unused variables. -# Removed trailing whitespace. -# -# Revision 1.5 2002/10/13 06:13:23 arensb -# Removed bogus #! line (this isn't a script!) -# Removed unused global variables. -# Added POD. -# Added some explanatory comments. -# Added some FIXME comments. -# -# Revision 1.4 2002/10/11 12:35:35 arensb -# Replaced &requireDBI with C4::Context->dbh -# -# Revision 1.3 2002/08/14 18:12:52 tonnesen -# Added copyright statement to all .pl and .pm files -# -# Revision 1.2 2002/07/02 20:31:33 tonnesen -# module added from rel-1-2 branch -# -# Revision 1.1.2.5 2002/06/29 17:33:47 amillar -# Allow DEFAULT as input to addz3950search. -# Check for existence of pid file (cat crashed otherwise). -# Return error messages in addz3950search. -# -# Revision 1.1.2.4 2002/06/28 18:07:27 tonnesen -# marcimport.pl will print an error message if it can not signal the -# processz3950queue program. The message contains instructions for starting the -# daemon. -# -# 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 20:54:31 tonnesen -# use warnings breaks on perl 5.005... -# -# Revision 1.1.2.1 2002/06/26 07:26:41 amillar -# New module for Z39.50 searching -#