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

(-)a/C4/Breeding.pm (-1 / +1 lines)
Lines 227-233 sub Z3950Search { Link Here
227
            $oConnection[$s]= create ZOOM::Connection($option1);
227
            $oConnection[$s]= create ZOOM::Connection($option1);
228
            $oConnection[$s]->connect( $server->{host}, $server->{port} );
228
            $oConnection[$s]->connect( $server->{host}, $server->{port} );
229
            $serverinfo[$s]->{host}= $server->{host};
229
            $serverinfo[$s]->{host}= $server->{host};
230
            $serverinfo[$s]->{name}= $server->{name};
230
            $serverinfo[$s]->{name}= $server->{servername};
231
            $serverinfo[$s]->{encd}= $server->{encoding} // "iso-5426";
231
            $serverinfo[$s]->{encd}= $server->{encoding} // "iso-5426";
232
            $s++;
232
            $s++;
233
        }    ## while fetch
233
        }    ## while fetch
(-)a/acqui/z3950_search.pl (-1 / +1 lines)
Lines 92-98 $template->param( Link Here
92
);
92
);
93
93
94
if ( $op ne "do_search" ) {
94
if ( $op ne "do_search" ) {
95
    my $sth = $dbh->prepare("select id,host,name,checked from z3950servers where recordtype <> 'authority' order by host");
95
    my $sth = $dbh->prepare("select id,host,servername,checked from z3950servers where recordtype='biblio' and servertype='zed' order by host");
96
    $sth->execute();
96
    $sth->execute();
97
    my $serverloop = $sth->fetchall_arrayref( {} );
97
    my $serverloop = $sth->fetchall_arrayref( {} );
98
    $template->param(
98
    $template->param(
(-)a/cataloguing/z3950_auth_search.pl (-1 / +1 lines)
Lines 64-70 $template->param( Link Here
64
);
64
);
65
65
66
if ( $op ne "do_search" ) {
66
if ( $op ne "do_search" ) {
67
    my $sth = $dbh->prepare("SELECT id,host,name,checked FROM z3950servers WHERE recordtype = 'authority' ORDER BY rank, name");
67
    my $sth = $dbh->prepare("SELECT id,host,servername,checked FROM z3950servers WHERE recordtype = 'authority' AND servertype='zed' ORDER BY rank, servername");
68
    $sth->execute();
68
    $sth->execute();
69
    my $serverloop = $sth->fetchall_arrayref( {} );
69
    my $serverloop = $sth->fetchall_arrayref( {} );
70
    $template->param(
70
    $template->param(
(-)a/cataloguing/z3950_search.pl (-1 / +1 lines)
Lines 73-79 $template->param( Link Here
73
);
73
);
74
74
75
if ( $op ne "do_search" ) {
75
if ( $op ne "do_search" ) {
76
    my $sth = $dbh->prepare("SELECT id,host,name,checked FROM z3950servers WHERE recordtype <> 'authority' ORDER BY rank, name");
76
    my $sth = $dbh->prepare("SELECT id,host,servername,checked FROM z3950servers WHERE recordtype='biblio' AND servertype='zed' ORDER BY rank, servername");
77
    $sth->execute();
77
    $sth->execute();
78
    my $serverloop = $sth->fetchall_arrayref( {} );
78
    my $serverloop = $sth->fetchall_arrayref( {} );
79
    $template->param(
79
    $template->param(
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt (-1 / +1 lines)
Lines 138-144 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
138
            [% ELSE %]
138
            [% ELSE %]
139
                <input type="checkbox" name="id" id="z3950_[% serverloo.id %]" value="[% serverloo.id %]" />
139
                <input type="checkbox" name="id" id="z3950_[% serverloo.id %]" value="[% serverloo.id %]" />
140
            [% END %]
140
            [% END %]
141
            <label for="z3950_[% serverloo.id %]">[% serverloo.name %] [[% serverloo.host %]]</label>
141
            <label for="z3950_[% serverloo.id %]">[% serverloo.servername %] [[% serverloo.host %]]</label>
142
142
143
        </p>
143
        </p>
144
    [% END %]
144
    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt (-1 / +1 lines)
Lines 136-142 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
136
                [% ELSE %]
136
                [% ELSE %]
137
                    <input type="checkbox" name="id" id="z3950_[% serverloo.id %]" value="[% serverloo.id %]" />
137
                    <input type="checkbox" name="id" id="z3950_[% serverloo.id %]" value="[% serverloo.id %]" />
138
                [% END %]
138
                [% END %]
139
                <label for="z3950_[% serverloo.id %]">[% serverloo.name %]</label>
139
                <label for="z3950_[% serverloo.id %]">[% serverloo.servername %]</label>
140
                </p>
140
                </p>
141
            [% END %]
141
            [% END %]
142
        </div>
142
        </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt (-2 / +1 lines)
Lines 137-143 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
137
            [% ELSE %]
137
            [% ELSE %]
138
                <input type="checkbox" name="id" id="z3950_[% serverloo.id %]" value="[% serverloo.id %]" />
138
                <input type="checkbox" name="id" id="z3950_[% serverloo.id %]" value="[% serverloo.id %]" />
139
            [% END %]
139
            [% END %]
140
            <label for="z3950_[% serverloo.id %]">[% serverloo.name %]</label>  
140
            <label for="z3950_[% serverloo.id %]">[% serverloo.servername %]</label>
141
141
142
        </p>
142
        </p>
143
    [% END %]
143
    [% END %]
144
- 

Return to bug 6536