[Koha-cvs] koha/C4 Context.pm [rel_3_0]
Joshua Ferraro
jmf at kados.org
Fri Nov 24 22:18:31 CET 2006
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Joshua Ferraro <kados> 06/11/24 21:18:31
Modified files:
C4 : Context.pm
Log message:
very minor changes, no functional ones, just comments, etc.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Context.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.43.2.5&r2=1.43.2.6
Patches:
Index: Context.pm
===================================================================
RCS file: /sources/koha/koha/C4/Context.pm,v
retrieving revision 1.43.2.5
retrieving revision 1.43.2.6
diff -u -b -r1.43.2.5 -r1.43.2.6
--- Context.pm 30 Oct 2006 13:24:16 -0000 1.43.2.5
+++ Context.pm 24 Nov 2006 21:18:31 -0000 1.43.2.6
@@ -16,7 +16,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Context.pm,v 1.43.2.5 2006/10/30 13:24:16 toins Exp $
+# $Id: Context.pm,v 1.43.2.6 2006/11/24 21:18:31 kados Exp $
use strict;
use DBI;
use ZOOM;
@@ -28,7 +28,7 @@
qw($context),
qw(@context_stack);
-$VERSION = do { my @v = '$Revision: 1.43.2.5 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.43.2.6 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
=head1 NAME
@@ -421,7 +421,6 @@
my $auth=shift;
my $piggyback=shift;
my $syntax=shift;
-
if ( defined($context->{"Zconn"}->{$server}) ) {
return $context->{"Zconn"}->{$server};
@@ -470,7 +469,7 @@
$o->option(elementSetName => "F"); # F for 'full' as opposed to B for 'brief'
$o->option(user=>$user) if $auth;
$o->option(password=>$password) if $auth;
- $o->option(databaseName => ($servername?$servername:"biblios")); #$context->{"config"}->{$server});
+ $o->option(databaseName => ($servername?$servername:"biblios"));
# create a new connection object
$Zconn= create ZOOM::Connection($o);
@@ -486,7 +485,7 @@
};
if ($@) {
# Koha manages the Zebra server -- this doesn't work currently for me because of permissions issues
- # Also, I'm skeptical about whether it's the best approach anyway
+ # Also, I'm skeptical about whether it's the best approach
warn "problem with Zebra";
if ( C4::Context->preference("ManageZebra") ) {
if ($@->code==10000 && $tried==0) { ##No connection try restarting Zebra
@@ -844,6 +843,9 @@
=cut
# $Log: Context.pm,v $
+# Revision 1.43.2.6 2006/11/24 21:18:31 kados
+# very minor changes, no functional ones, just comments, etc.
+#
# Revision 1.43.2.5 2006/10/30 13:24:16 toins
# fix some minor POD error.
#
More information about the Koha-cvs
mailing list