projects
/
koha_gimpoz
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug 7086 follow-up: removed warn
[koha_gimpoz]
/
acqui
/
z3950_search.pl
diff --git
a/acqui/z3950_search.pl
b/acqui/z3950_search.pl
index
b0a8b92
..
80503e0
100755
(executable)
--- a/
acqui/z3950_search.pl
+++ b/
acqui/z3950_search.pl
@@
-30,6
+30,7
@@
use C4::Context;
use C4::Breeding;
use C4::Koha;
use C4::Charset;
use C4::Breeding;
use C4::Koha;
use C4::Charset;
+use C4::Bookseller qw/ GetBookSellerFromId /;
use ZOOM;
my $input = new CGI;
use ZOOM;
my $input = new CGI;
@@
-44,6
+45,7
@@
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
}
);
}
);
+
my $dbh = C4::Context->dbh;
my $error = $input->param('error');
my $biblionumber = $input->param('biblionumber');
my $dbh = C4::Context->dbh;
my $error = $input->param('error');
my $biblionumber = $input->param('biblionumber');
@@
-102,10
+104,14
@@
foreach my $thisframeworkcode ( keys %$frameworks ) {
push @frameworkcodeloop, \%row;
}
push @frameworkcodeloop, \%row;
}
+my $vendor = GetBookSellerFromId($booksellerid);
$template->param( frameworkcode => $frameworkcode,
frameworkcodeloop => \@frameworkcodeloop,
booksellerid => $booksellerid,
$template->param( frameworkcode => $frameworkcode,
frameworkcodeloop => \@frameworkcodeloop,
booksellerid => $booksellerid,
- basketno => $basketno);
+ basketno => $basketno,
+ name => $vendor->{'name'}
+ );
+
if ( $op ne "do_search" ) {
if ( $op ne "do_search" ) {
@@
-128,8
+134,17
@@
if ( $op ne "do_search" ) {
}
else {
my @id = $input->param('id');
}
else {
my @id = $input->param('id');
+
+ if ( not defined @id ) {
+ # empty server list -> report and exit
+ $template->param( emptyserverlist => 1 );
+ output_html_with_http_headers $input, $cookie, $template->output;
+ exit;
+ }
+
my @oConnection;
my @oResult;
my @oConnection;
my @oResult;
+ my @errconn;
my $s = 0;
my $query;
my $nterms;
my $s = 0;
my $query;
my $nterms;
@@
-158,7
+173,7
@@
else {
$query .= " \@attr 1=21 \"$subject\" ";
$nterms++;
}
$query .= " \@attr 1=21 \"$subject\" ";
$nterms++;
}
- if ($lccn) {
+ if ($lccn) {
$query .= " \@attr 1=9 $lccn ";
$nterms++;
}
$query .= " \@attr 1=9 $lccn ";
$nterms++;
}
@@
-180,7
+195,6
@@
warn "query ".$query if $DEBUG;
$sth->execute($servid);
while ( $server = $sth->fetchrow_hashref ) {
warn "serverinfo ".join(':',%$server) if $DEBUG;
$sth->execute($servid);
while ( $server = $sth->fetchrow_hashref ) {
warn "serverinfo ".join(':',%$server) if $DEBUG;
- my $noconnection = 0;
my $option1 = new ZOOM::Options();
$option1->option( 'async' => 1 );
$option1->option( 'elementSetName', 'F' );
my $option1 = new ZOOM::Options();
$option1->option( 'async' => 1 );
$option1->option( 'elementSetName', 'F' );
@@
-231,9
+245,10
@@
sub displayresults {
my ( $error, $errmsg, $addinfo, $diagset ) =
$oConnection[$k]->error_x();
if ($error) {
my ( $error, $errmsg, $addinfo, $diagset ) =
$oConnection[$k]->error_x();
if ($error) {
- warn "$k $serverhost[$k] error $query: $errmsg ($error) $addinfo\n"
- if $DEBUG;
-
+ if ($error =~ m/^(10000|10007)$/ ) {
+ push(@errconn, {'server' => $serverhost[$k]});
+ }
+ $DEBUG and warn "$k $serverhost[$k] error $query: $errmsg ($error) $addinfo\n";
}
else {
my $numresults = $oResult[$k]->size();
}
else {
my $numresults = $oResult[$k]->size();
@@
-274,13
+289,6
@@
sub displayresults {
)
= ImportBreeding( $marcdata, 2, $serverhost[$k], $encoding[$k], $random, 'z3950' );
my %row_data;
)
= ImportBreeding( $marcdata, 2, $serverhost[$k], $encoding[$k], $random, 'z3950' );
my %row_data;
- if ( $i % 2 ) {
- $toggle = 1;
- }
- else {
- $toggle = 0;
- }
- $row_data{toggle} = $toggle;
$row_data{server} = $servername[$k];
$row_data{isbn} = $oldbiblio->{isbn};
$row_data{lccn} = $oldbiblio->{lccn};
$row_data{server} = $servername[$k];
$row_data{isbn} = $oldbiblio->{isbn};
$row_data{lccn} = $oldbiblio->{lccn};
@@
-289,9
+297,9
@@
sub displayresults {
$row_data{breedingid} = $breedingid;
$row_data{biblionumber} = $biblionumber;
push( @breeding_loop, \%row_data );
$row_data{breedingid} = $breedingid;
$row_data{biblionumber} = $biblionumber;
push( @breeding_loop, \%row_data );
-
+
} else {
} else {
- push(@breeding_loop,{'
toggle'=>($i % 2)?1:0,'
server'=>$servername[$k],'title'=>join(': ',$oConnection[$k]->error_x()),'breedingid'=>-1,'biblionumber'=>-1});
+ push(@breeding_loop,{'server'=>$servername[$k],'title'=>join(': ',$oConnection[$k]->error_x()),'breedingid'=>-1,'biblionumber'=>-1});
} # $rec
} # upto 5 results
} #$numresults
} # $rec
} # upto 5 results
} #$numresults
@@
-302,10
+310,11
@@
sub displayresults {
breeding_loop => \@breeding_loop,
server => $servername[$k],
numberpending => $numberpending,
breeding_loop => \@breeding_loop,
server => $servername[$k],
numberpending => $numberpending,
+ errconn => \@errconn
);
output_html_with_http_headers $input, $cookie, $template->output if $numberpending == 0;
);
output_html_with_http_headers $input, $cookie, $template->output if $numberpending == 0;
- #
print $template->output if $firstresult !=1;
+ # print $template->output if $firstresult !=1;
$firstresult++;
}
displayresults();
$firstresult++;
}
displayresults();