Attachment #30935 for bug #6536

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




use MARC::File::USMARC;
use C4::ImportBatch;
use C4::AuthoritiesMarc; #GuessAuthTypeCode, FindDuplicateAuthority
use Koha::Database;

use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);


    my @id= @{$pars->{id}};
    my $page= $pars->{page};
    my $biblionumber= $pars->{biblionumber};
    my $isbn= $pars->{isbn};
    my $issn= $pars->{issn};
    my $title= $pars->{title};
    my $author= $pars->{author};
    my $dewey= $pars->{dewey};
    my $subject= $pars->{subject};
    my $lccn= $pars->{lccn};
    my $lccall= $pars->{lccall};
    my $controlnumber= $pars->{controlnumber};
    my $srchany= $pars->{srchany};
    my $stdid= $pars->{stdid};

    my $show_next       = 0;
    my $total_pages     = 0;
    my $term;
    my @results;
    my @breeding_loop = ();
    my @oConnection;
    my @oResult;
    my @errconn;
    my $s = 0;
    my $query;
    my $nterms=0;
    my $imported=0;
    my @serverinfo; #replaces former serverhost, servername, encoding

    my ( $zquery, $squery ) = _build_query( $pars );
        $term=$isbn;
        $query .= " \@attr 1=7 \@attr 5=1 \"$term\" ";
        $nterms++;
    }
    if ($issn) {
        $term=$issn;
        $query .= " \@attr 1=8 \@attr 5=1 \"$term\" ";
        $nterms++;
    }
    if ($title) {
        $query .= " \@attr 1=4 \"$title\" ";
        $nterms++;
    }
    if ($author) {
        $query .= " \@attr 1=1003 \"$author\" ";
        $nterms++;
    }
    if ($dewey) {
        $query .= " \@attr 1=16 \"$dewey\" ";
        $nterms++;
    }
    if ($subject) {
        $query .= " \@attr 1=21 \"$subject\" ";
        $nterms++;
    }
    if ($lccn) {
        $query .= " \@attr 1=9 $lccn ";
        $nterms++;
    }
    if ($lccall) {
        $query .= " \@attr 1=16 \@attr 2=3 \@attr 3=1 \@attr 4=1 \@attr 5=1 \@attr 6=1 \"$lccall\" ";
        $nterms++;
    }
    if ($controlnumber) {
        $query .= " \@attr 1=12 \"$controlnumber\" ";
        $nterms++;
    }
    if($srchany) {
        $query .= " \@attr 1=1016 \"$srchany\" ";
        $nterms++;
    }
    if($stdid) {
        $query .= " \@attr 1=1007 \"$stdid\" ";
        $nterms++;
    }
    for my $i (1..$nterms-1) {
        $query = "\@and " . $query;
    }

    my $dbh   = C4::Context->dbh;
    foreach my $servid (@id) {
        my $sth = $dbh->prepare("select * from z3950servers where id=?");
        $sth->execute($servid);
        while (my $server = $sth->fetchrow_hashref) {
            my $option1= new ZOOM::Options();
            $option1->option( 'async' => 1 );
            $option1->option( 'elementSetName', 'F' );
            $option1->option( 'databaseName',   $server->{db} );
            $option1->option( 'user', $server->{userid} ) if $server->{userid};
            $option1->option( 'password', $server->{password} ) if $server->{password};
            $option1->option( 'preferredRecordSyntax', $server->{syntax} );
            $option1->option( 'timeout', $server->{timeout} ) if $server->{timeout};
            $oConnection[$s]= create ZOOM::Connection($option1);
            $oConnection[$s]->connect( $server->{host}, $server->{port} );
            $serverinfo[$s]->{host}= $server->{host};
            $serverinfo[$s]->{name}= $server->{servername};
            $serverinfo[$s]->{encd}= $server->{encoding} // "iso-5426";
            $s++;
        }    ## while fetch
    }    # foreach
    my $nremaining  = $s;

    for ( my $z = 0 ; $z < $s ; $z++ ) {
        $oResult[$z] = $oConnection[$z]->search_pqf($query);
    }

    my $schema = Koha::Database->new()->schema();
    my $rs = $schema->resultset('Z3950server')->search(
        { id => [ @id ] },
        { result_class => 'DBIx::Class::ResultClass::HashRefInflator' },
    );
    my @servers = $rs->all;
    foreach my $server ( @servers ) {
        $oConnection[$s] = _create_connection( $server );
        $oResult[$s] =
            $server->{servertype} eq 'zed'?
                $oConnection[$s]->search_pqf( $zquery ):
                $oConnection[$s]->search(new ZOOM::Query::CQL(
                    _translate_query( $server, $squery )));
        $s++;
    }

    my $nremaining = $s;
    while ( $nremaining-- ) {
        my $k;
        my $event;

            my ($error)= $oConnection[$k]->error_x(); #ignores errmsg, addinfo, diagset
            if ($error) {
                if ($error =~ m/^(10000|10007)$/ ) {
                    push(@errconn, { server => $servers[$k]->{host}, error => $error } );
                }
            }
            else {

                    $total_pages = int($numresults/20)+1 if $total_pages < ($numresults/20);
                    for ($i = ($page-1)*20; $i < (($numresults < ($page*20)) ? $numresults : ($page*20)); $i++) {
                        if($oResult[$k]->record($i)) {
                            my $res=_handle_one_result($oResult[$k]->record($i), $servers[$k], ++$imported, $biblionumber); #ignores error in sequence numbering
                            push @breeding_loop, $res if $res;
                        }
                        else {
                            push(@breeding_loop,{'server'=>$servers[$k]->{servername},'title'=>join(': ',$oConnection[$k]->error_x()),'breedingid'=>-1,'biblionumber'=>-1});
                        }
                    }
                }    #if $numresults

        $oConnection[$_]->destroy();
    }

    my @servers = ();
    foreach my $id (@id) {
        push @servers, {id => $id};
    }
    $template->param(
        breeding_loop => \@breeding_loop,
        servers => \@servers,

    );
}

sub _build_query {
    my ( $pars ) = @_;

    my $qry_build = {
        isbn    => '@attr 1=7 @attr 5=1 "#term" ',
        issn    => '@attr 1=8 @attr 5=1 "#term" ',
        title   => '@attr 1=4 #term ',
        author  => '@attr 1=1003 "#term" ',
        dewey   => '@attr 1=16 "#term" ',
        subject => '@attr 1=21 "#term" ',
        lccall  => '@attr 1=16 @attr 2=3 @attr 3=1 @attr 4=1 @attr 5=1 '.
                   '@attr 6=1 "#term" ',
        controlnumber => '@attr 1=12 "#term" ',
        srchany => '@attr 1=1016 "#term" ',
        stdid   => '@attr 1=1007 "#term" ',
    };

    my $zquery='';
    my $squery='';
    my $nterms=0;
    foreach my $k ( keys %$pars ) {
        if( ( my $val=$pars->{$k} ) && $qry_build->{$k} ) {
            $qry_build->{$k} =~ s/#term/$val/g;
            $zquery .= $qry_build->{$k};
            $squery .= "[$k]=\"$val\" and ";
            $nterms++;
        }
    }
    $zquery = "\@and " . $zquery for 2..$nterms;
    $squery =~ s/ and $//;
    return ( $zquery, $squery );
}

sub _handle_one_result {
    my ($zoomrec, $servhref, $seq, $bib)= @_;

    my $raw= $zoomrec->raw();
    my $marcrecord;
    if( $servhref->{servertype} eq 'sru' ) {
        $marcrecord= MARC::Record->new_from_xml( $raw, 'UTF-8',
            $servhref->{syntax} );
    } else {
        ($marcrecord) = MarcToUTF8Record($raw, C4::Context->preference('marcflavour'), $servhref->{encoding} // "iso-5426" ); #ignores charset return values
    }
    SetUTF8Flag($marcrecord);

    my $batch_id = GetZ3950BatchId($servhref->{servername});
    my $breedingid = AddBiblioToBatch($batch_id, $seq, $marcrecord, 'UTF-8', 0, 0);
        #FIXME passing 0 for z3950random
        #Will eliminate this unused field in a followup report

    return _add_rowdata(
        {
            biblionumber => $bib,
            server       => $servhref->{servername},
            breedingid   => $breedingid,
        }, $marcrecord) if $breedingid;
}

    return $isbn;
}

sub _create_connection {
    my ( $server ) = @_;
    my $option1= new ZOOM::Options();
    $option1->option( 'async' => 1 );
    $option1->option( 'elementSetName', 'F' );
    $option1->option( 'preferredRecordSyntax', $server->{syntax} );
    $option1->option( 'timeout', $server->{timeout} ) if $server->{timeout};

    if( $server->{servertype} eq 'sru' ) {
        foreach( split ',', $server->{sru_options}//'' ) {
            my @temp= split '=';
            $option1->option( $temp[0] => $temp[1] ) if @temp;
        }
    } elsif( $server->{servertype} eq 'zed' ) {
        $option1->option( 'databaseName',   $server->{db} );
        $option1->option( 'user', $server->{userid} ) if $server->{userid};
        $option1->option( 'password', $server->{password} ) if $server->{password};
    }

    my $obj= ZOOM::Connection->create($option1);
    if( $server->{servertype} eq 'sru' ) {
        my $host= $server->{host};
        if( $host !~ /^https?:\/\// ) {
            #Normally, host will not be prefixed by protocol.
            #In that case we can (safely) assume http.
            #In case someone prefixed with https, give it a try..
            $host = 'http://' . $host;
        }
        $obj->connect( $host.':'.$server->{port}.'/'.$server->{db} );
    } else {
        $obj->connect( $server->{host}, $server->{port} );
    }
    return $obj;
}

sub _translate_query { #SRU query adjusted per server cf. srufields column
    my ($server, $query) = @_;

    #sru_fields is in format title=field,isbn=field,...
    #if a field doesn't exist, try anywhere or remove [field]=
    my @parts= split(',', $server->{sru_fields} );
    my %trans= map { if( /=/ ) { ( $`,$' ) } else { () } } @parts;
    my $any= $trans{srchany}?$trans{srchany}.'=':'';

    my $q=$query;
    foreach my $key (keys %trans) {
        my $f=$trans{$key};
        if( $f ) {
            $q=~s/\[$key\]/$f/g;
        } else {
            $q=~s/\[$key\]=/$any/g;
        }
    }
    $q=~s/\[\w+\]=/$any/g; # remove remaining fields (not found in field list)
    return $q;
}

=head2 ImportBreedingAuth

ImportBreedingAuth($marcrecords,$overwrite_auth,$filename,$encoding,$z3950random,$batch_type);




use C4::Bookseller qw/ GetBookSellerFromId /;

my $input           = new CGI;
my $dbh             = C4::Context->dbh;
my $biblionumber    = $input->param('biblionumber')||0;
my $frameworkcode   = $input->param('frameworkcode')||'';
my $title           = $input->param('title');

);

if ( $op ne "do_search" ) {
    my $schema = Koha::Database->new()->schema();
    my $rs = $schema->resultset('Z3950server')->search(
        {
            recordtype => 'biblio',
            servertype => ['zed', 'sru'],
        },
        { result_class => 'DBIx::Class::ResultClass::HashRefInflator' },
    );
    $template->param(
        serverloop   => [ $rs->all ],
        opsearch     => "search",
    );
    output_html_with_http_headers $input, $cookie, $template->output;




use C4::Koha;

my $input        = new CGI;
my $dbh          = C4::Context->dbh;
my $error         = $input->param('error');
my $biblionumber  = $input->param('biblionumber') || 0;
my $frameworkcode = $input->param('frameworkcode');

);

if ( $op ne "do_search" ) {
    my $schema = Koha::Database->new()->schema();
    my $rs = $schema->resultset('Z3950server')->search(
        {
            recordtype => 'biblio',
            servertype => ['zed', 'sru'],
        },
        { result_class => 'DBIx::Class::ResultClass::HashRefInflator' },
    );
    $template->param(
        serverloop   => [ $rs->all ],
        opsearch     => "search",
    );
    output_html_with_http_headers $input, $cookie, $template->output;
- 

Return to bug 6536

Lines 29-35 use C4::Breeding; Link Here

(-)a/cataloguing/z3950_search.pl (-6 / +9 lines)
29	use C4::Koha;	29	use C4::Koha;
30		30
31	my $input = new CGI;	31	my $input = new CGI;
32	my $dbh = C4::Context->dbh;
33	my $error = $input->param('error');	32	my $error = $input->param('error');
34	my $biblionumber = $input->param('biblionumber') \|\| 0;	33	my $biblionumber = $input->param('biblionumber') \|\| 0;
35	my $frameworkcode = $input->param('frameworkcode');	34	my $frameworkcode = $input->param('frameworkcode');
Lines 73-83 $template->param( Link Here
73	);	72	);
74		73
75	if ( $op ne "do_search" ) {	74	if ( $op ne "do_search" ) {
76	my $sth = $dbh->prepare("SELECT id,host,servername,checked FROM z3950servers WHERE recordtype='biblio' AND servertype='zed' ORDER BY rank, servername");	75	my $schema = Koha::Database->new()->schema();
77	$sth->execute();	76	my $rs = $schema->resultset('Z3950server')->search(
78	my $serverloop = $sth->fetchall_arrayref( {} );	77	{
		78	recordtype => 'biblio',
		79	servertype => ['zed', 'sru'],
		80	},
		81	{ result_class => 'DBIx::Class::ResultClass::HashRefInflator' },
		82	);
79	$template->param(	83	$template->param(
80	serverloop => $serverloop,	84	serverloop => [ $rs->all ],
81	opsearch => "search",	85	opsearch => "search",
82	);	86	);
83	output_html_with_http_headers $input, $cookie, $template->output;	87	output_html_with_http_headers $input, $cookie, $template->output;
84	-

Lines 27-32 use C4::Charset; Link Here

(-)a/C4/Breeding.pm (-101 / +121 lines)
27	use MARC::File::USMARC;	27	use MARC::File::USMARC;
28	use C4::ImportBatch;	28	use C4::ImportBatch;
29	use C4::AuthoritiesMarc; #GuessAuthTypeCode, FindDuplicateAuthority	29	use C4::AuthoritiesMarc; #GuessAuthTypeCode, FindDuplicateAuthority
		30	use Koha::Database;
30		31
31	use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);	32	use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
32		33
Lines 135-243 sub Z3950Search { Link Here
135	my @id= @{$pars->{id}};	136	my @id= @{$pars->{id}};
136	my $page= $pars->{page};	137	my $page= $pars->{page};
137	my $biblionumber= $pars->{biblionumber};	138	my $biblionumber= $pars->{biblionumber};
138	my $isbn= $pars->{isbn};
139	my $issn= $pars->{issn};
140	my $title= $pars->{title};
141	my $author= $pars->{author};
142	my $dewey= $pars->{dewey};
143	my $subject= $pars->{subject};
144	my $lccn= $pars->{lccn};
145	my $lccall= $pars->{lccall};
146	my $controlnumber= $pars->{controlnumber};
147	my $srchany= $pars->{srchany};
148	my $stdid= $pars->{stdid};
149		139
150	my $show_next = 0;	140	my $show_next = 0;
151	my $total_pages = 0;	141	my $total_pages = 0;
152	my $term;
153	my @results;	142	my @results;
154	my @breeding_loop = ();	143	my @breeding_loop = ();
155	my @oConnection;	144	my @oConnection;
156	my @oResult;	145	my @oResult;
157	my @errconn;	146	my @errconn;
158	my $s = 0;	147	my $s = 0;
159	my $query;
160	my $nterms=0;
161	my $imported=0;	148	my $imported=0;
162	my @serverinfo; #replaces former serverhost, servername, encoding
163		149
164	if ($isbn) {	150	my ( $zquery, $squery ) = _build_query( $pars );
165	$term=$isbn;
166	$query .= " \@attr 1=7 \@attr 5=1 \"$term\" ";
167	$nterms++;
168	}
169	if ($issn) {
170	$term=$issn;
171	$query .= " \@attr 1=8 \@attr 5=1 \"$term\" ";
172	$nterms++;
173	}
174	if ($title) {
175	$query .= " \@attr 1=4 \"$title\" ";
176	$nterms++;
177	}
178	if ($author) {
179	$query .= " \@attr 1=1003 \"$author\" ";
180	$nterms++;
181	}
182	if ($dewey) {
183	$query .= " \@attr 1=16 \"$dewey\" ";
184	$nterms++;
185	}
186	if ($subject) {
187	$query .= " \@attr 1=21 \"$subject\" ";
188	$nterms++;
189	}
190	if ($lccn) {
191	$query .= " \@attr 1=9 $lccn ";
192	$nterms++;
193	}
194	if ($lccall) {
195	$query .= " \@attr 1=16 \@attr 2=3 \@attr 3=1 \@attr 4=1 \@attr 5=1 \@attr 6=1 \"$lccall\" ";
196	$nterms++;
197	}
198	if ($controlnumber) {
199	$query .= " \@attr 1=12 \"$controlnumber\" ";
200	$nterms++;
201	}
202	if($srchany) {
203	$query .= " \@attr 1=1016 \"$srchany\" ";
204	$nterms++;
205	}
206	if($stdid) {
207	$query .= " \@attr 1=1007 \"$stdid\" ";
208	$nterms++;
209	}
210	for my $i (1..$nterms-1) {
211	$query = "\@and " . $query;
212	}
213
214	my $dbh = C4::Context->dbh;
215	foreach my $servid (@id) {
216	my $sth = $dbh->prepare("select * from z3950servers where id=?");
217	$sth->execute($servid);
218	while (my $server = $sth->fetchrow_hashref) {
219	my $option1= new ZOOM::Options();
220	$option1->option( 'async' => 1 );
221	$option1->option( 'elementSetName', 'F' );
222	$option1->option( 'databaseName', $server->{db} );
223	$option1->option( 'user', $server->{userid} ) if $server->{userid};
224	$option1->option( 'password', $server->{password} ) if $server->{password};
225	$option1->option( 'preferredRecordSyntax', $server->{syntax} );
226	$option1->option( 'timeout', $server->{timeout} ) if $server->{timeout};
227	$oConnection[$s]= create ZOOM::Connection($option1);
228	$oConnection[$s]->connect( $server->{host}, $server->{port} );
229	$serverinfo[$s]->{host}= $server->{host};
230	$serverinfo[$s]->{name}= $server->{servername};
231	$serverinfo[$s]->{encd}= $server->{encoding} // "iso-5426";
232	$s++;
233	} ## while fetch
234	} # foreach
235	my $nremaining = $s;
236
237	for ( my $z = 0 ; $z < $s ; $z++ ) {
238	$oResult[$z] = $oConnection[$z]->search_pqf($query);
239	}
240		151
		152	my $schema = Koha::Database->new()->schema();
		153	my $rs = $schema->resultset('Z3950server')->search(
		154	{ id => [ @id ] },
		155	{ result_class => 'DBIx::Class::ResultClass::HashRefInflator' },
		156	);
		157	my @servers = $rs->all;
		158	foreach my $server ( @servers ) {
		159	$oConnection[$s] = _create_connection( $server );
		160	$oResult[$s] =
		161	$server->{servertype} eq 'zed'?
		162	$oConnection[$s]->search_pqf( $zquery ):
		163	$oConnection[$s]->search(new ZOOM::Query::CQL(
		164	_translate_query( $server, $squery )));
		165	$s++;
		166	}
		167
		168	my $nremaining = $s;
241	while ( $nremaining-- ) {	169	while ( $nremaining-- ) {
242	my $k;	170	my $k;
243	my $event;	171	my $event;
Lines 251-257 sub Z3950Search { Link Here
251	my ($error)= $oConnection[$k]->error_x(); #ignores errmsg, addinfo, diagset	179	my ($error)= $oConnection[$k]->error_x(); #ignores errmsg, addinfo, diagset
252	if ($error) {	180	if ($error) {
253	if ($error =~ m/^(10000\|10007)$/ ) {	181	if ($error =~ m/^(10000\|10007)$/ ) {
254	push(@errconn, { server => $serverinfo[$k]->{host}, error => $error } );	182	push(@errconn, { server => $servers[$k]->{host}, error => $error } );
255	}	183	}
256	}	184	}
257	else {	185	else {
Lines 263-273 sub Z3950Search { Link Here
263	$total_pages = int($numresults/20)+1 if $total_pages < ($numresults/20);	191	$total_pages = int($numresults/20)+1 if $total_pages < ($numresults/20);
264	for ($i = ($page-1)20; $i < (($numresults < ($page20)) ? $numresults : ($page*20)); $i++) {	192	for ($i = ($page-1)20; $i < (($numresults < ($page20)) ? $numresults : ($page*20)); $i++) {
265	if($oResult[$k]->record($i)) {	193	if($oResult[$k]->record($i)) {
266	my $res=_handle_one_result($oResult[$k]->record($i), $serverinfo[$k], ++$imported, $biblionumber); #ignores error in sequence numbering	194	my $res=_handle_one_result($oResult[$k]->record($i), $servers[$k], ++$imported, $biblionumber); #ignores error in sequence numbering
267	push @breeding_loop, $res if $res;	195	push @breeding_loop, $res if $res;
268	}	196	}
269	else {	197	else {
270	push(@breeding_loop,{'server'=>$serverinfo[$k]->{name},'title'=>join(': ',$oConnection[$k]->error_x()),'breedingid'=>-1,'biblionumber'=>-1});	198	push(@breeding_loop,{'server'=>$servers[$k]->{servername},'title'=>join(': ',$oConnection[$k]->error_x()),'breedingid'=>-1,'biblionumber'=>-1});
271	}	199	}
272	}	200	}
273	} #if $numresults	201	} #if $numresults
Lines 289-298 sub Z3950Search { Link Here
289	$oConnection[$_]->destroy();	217	$oConnection[$_]->destroy();
290	}	218	}
291		219
292	my @servers = ();
293	foreach my $id (@id) {
294	push @servers, {id => $id};
295	}
296	$template->param(	220	$template->param(
297	breeding_loop => \@breeding_loop,	221	breeding_loop => \@breeding_loop,
298	servers => \@servers,	222	servers => \@servers,
Lines 300-313 sub Z3950Search { Link Here
300	);	224	);
301	}	225	}
302		226
		227	sub _build_query {
		228	my ( $pars ) = @_;
		229
		230	my $qry_build = {
		231	isbn => '@attr 1=7 @attr 5=1 "#term" ',
		232	issn => '@attr 1=8 @attr 5=1 "#term" ',
		233	title => '@attr 1=4 #term ',
		234	author => '@attr 1=1003 "#term" ',
		235	dewey => '@attr 1=16 "#term" ',
		236	subject => '@attr 1=21 "#term" ',
		237	lccall => '@attr 1=16 @attr 2=3 @attr 3=1 @attr 4=1 @attr 5=1 '.
		238	'@attr 6=1 "#term" ',
		239	controlnumber => '@attr 1=12 "#term" ',
		240	srchany => '@attr 1=1016 "#term" ',
		241	stdid => '@attr 1=1007 "#term" ',
		242	};
		243
		244	my $zquery='';
		245	my $squery='';
		246	my $nterms=0;
		247	foreach my $k ( keys %$pars ) {
		248	if( ( my $val=$pars->{$k} ) && $qry_build->{$k} ) {
		249	$qry_build->{$k} =~ s/#term/$val/g;
		250	$zquery .= $qry_build->{$k};
		251	$squery .= "[$k]=\"$val\" and ";
		252	$nterms++;
		253	}
		254	}
		255	$zquery = "\@and " . $zquery for 2..$nterms;
		256	$squery =~ s/ and $//;
		257	return ( $zquery, $squery );
		258	}
		259
303	sub _handle_one_result {	260	sub _handle_one_result {
304	my ($zoomrec, $servhref, $seq, $bib)= @_;	261	my ($zoomrec, $servhref, $seq, $bib)= @_;
305		262
306	my $raw= $zoomrec->raw();	263	my $raw= $zoomrec->raw();
307	my ($marcrecord) = MarcToUTF8Record($raw, C4::Context->preference('marcflavour'), $servhref->{encd}); #ignores charset return values	264	my $marcrecord;
		265	if( $servhref->{servertype} eq 'sru' ) {
		266	$marcrecord= MARC::Record->new_from_xml( $raw, 'UTF-8',
		267	$servhref->{syntax} );
		268	} else {
		269	($marcrecord) = MarcToUTF8Record($raw, C4::Context->preference('marcflavour'), $servhref->{encoding} // "iso-5426" ); #ignores charset return values
		270	}
308	SetUTF8Flag($marcrecord);	271	SetUTF8Flag($marcrecord);
309		272
310	my $batch_id = GetZ3950BatchId($servhref->{name});	273	my $batch_id = GetZ3950BatchId($servhref->{servername});
311	my $breedingid = AddBiblioToBatch($batch_id, $seq, $marcrecord, 'UTF-8', 0, 0);	274	my $breedingid = AddBiblioToBatch($batch_id, $seq, $marcrecord, 'UTF-8', 0, 0);
312	#FIXME passing 0 for z3950random	275	#FIXME passing 0 for z3950random
313	#Will eliminate this unused field in a followup report	276	#Will eliminate this unused field in a followup report
Lines 319-325 sub _handle_one_result { Link Here
319	return _add_rowdata(	282	return _add_rowdata(
320	{	283	{
321	biblionumber => $bib,	284	biblionumber => $bib,
322	server => $servhref->{name},	285	server => $servhref->{servername},
323	breedingid => $breedingid,	286	breedingid => $breedingid,
324	}, $marcrecord) if $breedingid;	287	}, $marcrecord) if $breedingid;
325	}	288	}
Lines 354-359 sub _isbn_replace { Link Here
354	return $isbn;	317	return $isbn;
355	}	318	}
356		319
		320	sub _create_connection {
		321	my ( $server ) = @_;
		322	my $option1= new ZOOM::Options();
		323	$option1->option( 'async' => 1 );
		324	$option1->option( 'elementSetName', 'F' );
		325	$option1->option( 'preferredRecordSyntax', $server->{syntax} );
		326	$option1->option( 'timeout', $server->{timeout} ) if $server->{timeout};
		327
		328	if( $server->{servertype} eq 'sru' ) {
		329	foreach( split ',', $server->{sru_options}//'' ) {
		330	my @temp= split '=';
		331	$option1->option( $temp[0] => $temp[1] ) if @temp;
		332	}
		333	} elsif( $server->{servertype} eq 'zed' ) {
		334	$option1->option( 'databaseName', $server->{db} );
		335	$option1->option( 'user', $server->{userid} ) if $server->{userid};
		336	$option1->option( 'password', $server->{password} ) if $server->{password};
		337	}
		338
		339	my $obj= ZOOM::Connection->create($option1);
		340	if( $server->{servertype} eq 'sru' ) {
		341	my $host= $server->{host};
		342	if( $host !~ /^https?:\/\// ) {
		343	#Normally, host will not be prefixed by protocol.
		344	#In that case we can (safely) assume http.
		345	#In case someone prefixed with https, give it a try..
		346	$host = 'http://' . $host;
		347	}
		348	$obj->connect( $host.':'.$server->{port}.'/'.$server->{db} );
		349	} else {
		350	$obj->connect( $server->{host}, $server->{port} );
		351	}
		352	return $obj;
		353	}
		354
		355	sub _translate_query { #SRU query adjusted per server cf. srufields column
		356	my ($server, $query) = @_;
		357
		358	#sru_fields is in format title=field,isbn=field,...
		359	#if a field doesn't exist, try anywhere or remove [field]=
		360	my @parts= split(',', $server->{sru_fields} );
		361	my %trans= map { if( /=/ ) { ( $`,$' ) } else { () } } @parts;
		362	my $any= $trans{srchany}?$trans{srchany}.'=':'';
		363
		364	my $q=$query;
		365	foreach my $key (keys %trans) {
		366	my $f=$trans{$key};
		367	if( $f ) {
		368	$q=~s/\[$key\]/$f/g;
		369	} else {
		370	$q=~s/\[$key\]=/$any/g;
		371	}
		372	}
		373	$q=~s/\[\w+\]=/$any/g; # remove remaining fields (not found in field list)
		374	return $q;
		375	}
		376
357	=head2 ImportBreedingAuth	377	=head2 ImportBreedingAuth
358		378
359	ImportBreedingAuth($marcrecords,$overwrite_auth,$filename,$encoding,$z3950random,$batch_type);	379	ImportBreedingAuth($marcrecords,$overwrite_auth,$filename,$encoding,$z3950random,$batch_type);

Lines 31-37 use C4::Koha; Link Here

(-)a/acqui/z3950_search.pl (-5 / +9 lines)
31	use C4::Bookseller qw/ GetBookSellerFromId /;	31	use C4::Bookseller qw/ GetBookSellerFromId /;
32		32
33	my $input = new CGI;	33	my $input = new CGI;
34	my $dbh = C4::Context->dbh;
35	my $biblionumber = $input->param('biblionumber')\|\|0;	34	my $biblionumber = $input->param('biblionumber')\|\|0;
36	my $frameworkcode = $input->param('frameworkcode')\|\|'';	35	my $frameworkcode = $input->param('frameworkcode')\|\|'';
37	my $title = $input->param('title');	36	my $title = $input->param('title');
Lines 92-102 $template->param( Link Here
92	);	91	);
93		92
94	if ( $op ne "do_search" ) {	93	if ( $op ne "do_search" ) {
95	my $sth = $dbh->prepare("select id,host,servername,checked from z3950servers where recordtype='biblio' and servertype='zed' order by host");	94	my $schema = Koha::Database->new()->schema();
96	$sth->execute();	95	my $rs = $schema->resultset('Z3950server')->search(
97	my $serverloop = $sth->fetchall_arrayref( {} );	96	{
		97	recordtype => 'biblio',
		98	servertype => ['zed', 'sru'],
		99	},
		100	{ result_class => 'DBIx::Class::ResultClass::HashRefInflator' },
		101	);
98	$template->param(	102	$template->param(
99	serverloop => $serverloop,	103	serverloop => [ $rs->all ],
100	opsearch => "search",	104	opsearch => "search",
101	);	105	);
102	output_html_with_http_headers $input, $cookie, $template->output;	106	output_html_with_http_headers $input, $cookie, $template->output;