View | Details | Raw Unified | Return to bug 41102
Collapse All | Expand All

(-)a/C4/Context.pm (-6 / +7 lines)
Lines 572-588 sub _new_Zconn { Link Here
572
    $syntax         = 'xml';
572
    $syntax         = 'xml';
573
    $elementSetName = 'marcxml';
573
    $elementSetName = 'marcxml';
574
574
575
    my $host       = _common_config( $server, 'listen' )->{content};
575
    my $host = _common_config( $server, 'listen' );
576
    $host = $host->{content};
576
    my $serverinfo = _common_config( $server, 'serverinfo' );
577
    my $serverinfo = _common_config( $server, 'serverinfo' );
577
    my $user       = $serverinfo->{user};
578
    my $user       = $serverinfo->{user};
578
    my $password   = $serverinfo->{password};
579
    my $password   = $serverinfo->{password};
579
    eval {
580
    eval {
580
        # set options
581
        # set options
581
        my $o = ZOOM::Options->new();
582
        my $o = ZOOM::Options->new();
582
        $o->option( user                  => $user )     if $user && $password;
583
        $o->option( user     => $user )     if $user && $password;
583
        $o->option( password              => $password ) if $user && $password;
584
        $o->option( password => $password ) if $user && $password;
584
        $o->option( async                 => 1 )         if $async;
585
        $o->option( async    => 1 )         if $async;
585
        $o->option( cqlfile               => _common_config( $server, 'server' )->{cql2rpn} );
586
        my $server_conf = _common_config( $server, 'server' );
587
        $o->option( cqlfile               => $server_conf->{cql2rpn} );
586
        $o->option( cclfile               => $serverinfo->{ccl2rpn} );
588
        $o->option( cclfile               => $serverinfo->{ccl2rpn} );
587
        $o->option( preferredRecordSyntax => $syntax );
589
        $o->option( preferredRecordSyntax => $syntax );
588
        $o->option( elementSetName        => $elementSetName ) if $elementSetName;
590
        $o->option( elementSetName        => $elementSetName ) if $elementSetName;
589
- 

Return to bug 41102