[Koha-cvs] koha/C4 Context.pm [dev_week]

[Ryan Higgins]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Ryan Higgins <rych>     07/01/14 22:40:26

Modified files:
        C4             : Context.pm 

Log message:
        using zebra-dbname from config, change XMLIn forcearray

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Context.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.18.2.5.2.14&r2=1.18.2.5.2.15

Patches:
Index: Context.pm
===================================================================
RCS file: /sources/koha/koha/C4/Context.pm,v
retrieving revision 1.18.2.5.2.14
retrieving revision 1.18.2.5.2.15
diff -u -b -r1.18.2.5.2.14 -r1.18.2.5.2.15
--- Context.pm  24 Sep 2006 15:24:06 -0000      1.18.2.5.2.14
+++ Context.pm  14 Jan 2007 22:40:26 -0000      1.18.2.5.2.15
@@ -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.18.2.5.2.14 2006/09/24 15:24:06 kados Exp $
+# $Id: Context.pm,v 1.18.2.5.2.15 2007/01/14 22:40:26 rych Exp $
 use strict;
 use DBI;
 use ZOOM;
@@ -28,7 +28,7 @@
        qw($context),
        qw(@context_stack);
 
-$VERSION = do { my @v = '$Revision: 1.18.2.5.2.14 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.18.2.5.2.15 $' =~ /\d+/g;
                shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
@@ -138,7 +138,8 @@
 sub read_config_file {
        my $fname = shift;      # Config file to read
        my $retval = {};        # Return value: ref-to-hash holding the 
configuration
-       my $koha = XMLin($fname, keyattr => ['id'],forcearray => ['listen']);
+#      my $koha = XMLin($fname, keyattr => ['id'],forcearray => ['listen']);
+       my $koha = XMLin($fname, keyattr => ['id'],forcearray => 
['listen','server','serverinfo']);
        return $koha;
 }
 
@@ -470,7 +471,8 @@
                $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 => "biblios"); 
#$context->{"config"}->{$server});
+#              $o->option(databaseName => "biblios"); 
+               $o->option(databaseName => $context->{"config"}->{$server});
 
                # create a new connection object
                $Zconn= create ZOOM::Connection($o);
@@ -841,6 +843,9 @@
 
 =cut
 # $Log: Context.pm,v $
+# Revision 1.18.2.5.2.15  2007/01/14 22:40:26  rych
+# using zebra-dbname from config, change XMLIn forcearray
+#
 # Revision 1.18.2.5.2.14  2006/09/24 15:24:06  kados
 # remove Zebraauth routine, fold the functionality into Zconn
 # Zconn can now take several arguments ... this will probably