(MT 3267) Add Homebranch and Holdingbranch search criterion on circulation stat.

[koha.git] / C4 / Z3950.pm

diff --git a/C4/Z3950.pm b/C4/Z3950.pm
old mode 100755 (executable)
new mode 100644 (file)
index a1b1131..4c830ec
--- a/C4/Z3950.pm
+++ b/C4/Z3950.pm
@@ -1,6 +1,5 @@
 package C4::Z3950;
 
-# $Id$
 
 # Routines for handling Z39.50 lookups
 
@@ -8,7 +7,6 @@ package C4::Z3950;
 
 # Licensed under the GPL
 
-
 # Copyright 2000-2002 Katipo Communications
 #
 # This file is part of Koha.
@@ -29,20 +27,26 @@ package C4::Z3950;
 use strict;
 
 # standard or CPAN modules used
+use DBI;
 
 # Koha modules used
-use C4::Context;
 use C4::Input;
 use C4::Biblio;
 
-#------------------
-
-require Exporter;
-
 use vars qw($VERSION @ISA @EXPORT);
 
-# set the version for version checking
-$VERSION = 0.01;
+BEGIN {
+       # set the version for version checking
+       $VERSION = 3.01;
+       require Exporter;
+       @ISA = qw(Exporter);
+       @EXPORT = qw(
+               &getz3950servers
+               &z3950servername
+               &addz3950queue
+               &checkz3950searchdone
+       );
+}
 
 =head1 NAME
 
@@ -61,17 +65,6 @@ entering Z39.50 lookup requests.
 
 =over 2
 
-=cut
-
-@ISA = qw(Exporter);
-@EXPORT = qw(
-       &getz3950servers
-       &z3950servername
-       &addz3950queue
-       &checkz3950searchdone
-);
-
-#------------------------------------------------
 =item getz3950servers
 
   @servers= &getz3950servers(checked);
@@ -82,6 +75,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;
@@ -110,6 +104,7 @@ C<$server_id> is the Z39.50 server ID to look up.
 C<$dbh> is ignored.
 
 =cut
+
 #'
 
 sub z3950servername {
@@ -165,6 +160,7 @@ C<&addz3950queue> returns an error message. If it was successful, the
 error message is the empty string.
 
 =cut
+
 #'
 sub addz3950queue {
        use strict;
@@ -275,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;
@@ -304,17 +301,11 @@ Koha Developement team <info@koha.org>
 =cut
 
 #--------------------------------------
-# $Log$
-# Revision 1.11  2006/08/25 21:07:08  tgarip1957
-# New set of routines for HEAD.
-# Uses a complete new ZEBRA Indexing.
-# ZEBRA is now XML and comprises of a KOHA meta record. Explanatory notes will be on koha-devel
-# Fixes UTF8 problems
-# Fixes bug with authorities
-# SQL database major changes.
-# Separate biblioograaphic and holdings records. Biblioitems table depreceated
-# etc. etc.
-# Wait for explanatory document on koha-devel
+# 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
@@ -326,13 +317,13 @@ Koha Developement team <info@koha.org>
 # * 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.
+# * 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 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.
+# * 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...