my $srchany = $input->param('srchany');
my $random = $input->param('random') || rand(1000000000); # this var is not useful anymore just kept for rel2_2 compatibility
my $op = $input->param('op');
+
+my $page = $input->param('current_page') || 1;
+$page = $input->param('goto_page') if $input->param('changepage_goto');
+my $show_next = 0;
+my $total_pages = 0;
+
my $numberpending;
my $attr = '';
my $term;
});
$template->param( frameworkcode => $frameworkcode, );
+$template->param(
+ isbn => $isbn,
+ issn => $issn,
+ lccn => $lccn,
+ lccall => $lccall,
+ title => $title,
+ author => $author,
+ controlnumber=> $controlnumber,
+ stdid => $stdid,
+ srchany => $srchany,
+ biblionumber => $biblionumber,
+ dewey => $dewey,
+ subject => $subject,
+);
if ( $op ne "do_search" ) {
- my $sth = $dbh->prepare("select id,host,name,checked from z3950servers order by host");
+ my $sth = $dbh->prepare("SELECT id,host,name,checked FROM z3950servers ORDER BY rank, name");
$sth->execute();
my $serverloop = $sth->fetchall_arrayref( {} );
$template->param(
- isbn => $isbn,
- issn => $issn,
- lccn => $lccn,
- lccall => $lccall,
- title => $title,
- author => $author,
- controlnumber=> $controlnumber,
- stdid => $stdid,
- srchany => $srchany,
serverloop => $serverloop,
opsearch => "search",
- biblionumber => $biblionumber,
);
output_html_with_http_headers $input, $cookie, $template->output;
}
my @oResult;
my @errconn;
my $s = 0;
- my $query;
+ my $query = '';
my $nterms;
- if ($isbn || $issn) {
- $term=$isbn if ($isbn);
- $term=$issn if ($issn);
- $query .= " \@or \@attr 1=8 \"$term\" \@attr 1=7 \"$term\" ";
+ if ($isbn) {
+ $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) {
warn "query ".$query if $DEBUG;
foreach my $servid (@id) {
- my $sth = $dbh->prepare("select * from z3950servers where id=?");
+ my $sth = $dbh->prepare("SELECT * FROM z3950servers WHERE id=? ORDER BY rank, name");
$sth->execute($servid);
while ( $server = $sth->fetchrow_hashref ) {
warn "serverinfo ".join(':',%$server) if $DEBUG;
$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)
|| $DEBUG
&& warn( "" . $oConnection[$s]->errmsg() );
$oConnection[$k]->error_x();
if ($error) {
if ($error =~ m/^(10000|10007)$/ ) {
- push(@errconn, {'server' => $serverhost[$k]});
+ push(@errconn, {'server' => $serverhost[$k], 'error' => $error});
}
$DEBUG and warn "$k $serverhost[$k] error $query: $errmsg ($error) $addinfo\n";
}
my $numresults = $oResult[$k]->size();
my $i;
my $result = '';
- if ( $numresults > 0 ) {
- for ($i = 0; $i < (($numresults < 20) ? $numresults : 20); $i++) {
+ if ( $numresults > 0 and $numresults >= (($page-1)*20)) {
+ $show_next = 1 if $numresults >= ($page*20);
+ $total_pages = int($numresults/20)+1 if $total_pages < ($numresults/20);
+ for ($i = ($page-1)*20; $i < (($numresults < ($page*20)) ? $numresults : ($page*20)); $i++) {
my $rec = $oResult[$k]->record($i);
if ($rec) {
my $marcrecord;
## In HEAD i change everything to UTF-8
# In rel2_2 i am not sure what encoding is so no character conversion is done here
##Add necessary encoding changes to here -TG
+
+ # Normalize the record so it doesn't have separated diacritics
+ SetUTF8Flag($marcrecord);
+
my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, "" );
$oldbiblio->{isbn} =~ s/ |-|\.//g if $oldbiblio->{isbn};
# pad | and ( with spaces to allow line breaks in the HTML
}
} # if $k !=0
$numberpending = $nremaining - 1;
+
+ my @servers = ();
+ foreach my $id (@id) {
+ push(@servers,{id => $id});
+ }
+
$template->param(
breeding_loop => \@breeding_loop,
server => $servername[$k],
numberpending => $numberpending,
biblionumber => $biblionumber,
- errconn => \@errconn
+ errconn => \@errconn,
+ current_page => $page,
+ servers => \@servers,
+ total_pages => $total_pages,
);
+ $template->param(show_nextbutton=>1) if $show_next;
+ $template->param(show_prevbutton=>1) if $page != 1;
output_html_with_http_headers $input, $cookie, $template->output if $numberpending == 0;