[Koha-cvs] koha/C4 Search.pm [rel_3_0]

[Henri-Damien LAURENT]

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Henri-Damien LAURENT <hdl>	07/01/09 14:22:31

Modified files:
	C4             : Search.pm 

Log message:
	Adding some checks before comparison.
	In order to avoid some warnings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Search.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.120.2.39&r2=1.120.2.40

Patches:
Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.120.2.39
retrieving revision 1.120.2.40
diff -u -b -r1.120.2.39 -r1.120.2.40
--- Search.pm	4 Jan 2007 13:11:34 -0000	1.120.2.39
+++ Search.pm	9 Jan 2007 14:22:31 -0000	1.120.2.40
@@ -25,7 +25,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.120.2.39 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.120.2.40 $' =~ /\d+/g;
     shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
 };
 
@@ -186,7 +186,7 @@
 
     #@servers = (C4::Context->config("biblioserver")) unless @servers;
     @servers =
-      ("biblioserver")
+      ("biblioserver") unless @servers
       ;    # FIXME hardcoded value. See catalog/search.pl & opac-search.pl too.
 
     # Connect & Search
@@ -754,6 +754,9 @@
     $federated_query =~ s/  / /g;
     $federated_query =~ s/^ //g;
     $federated_query =~ s/:/=/g;
+    my $federated_query_opensearch = $federated_query;
+
+#     my $federated_query_RPN = new ZOOM::Query::CCL2RPN( $query , C4::Context->ZConn('biblioserver'));
 
     $human_search_desc =~ s/  / /g;
     $human_search_desc =~ s/^ //g;
@@ -824,14 +827,14 @@
     }
     my $times;
 
-    if ( $offset + $results_per_page <= $hits ) {
+    if ( $hits && $offset + $results_per_page <= $hits ) {
         $times = $offset + $results_per_page;
     }
     else {
         $times = $hits;
     }
 
-    for ( my $i = $offset ; $i < $times ; $i++ ) {
+    for ( my $i = $offset ; $i <= $times - 1 ; $i++ ) {
         my $marcrecord;
         $marcrecord = MARC::File::USMARC::decode( $marcresults[$i] );