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

[paul poulain]

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch: 	
Changes by:	paul poulain <tipaul at savannah.gnu.org>	06/02/14 11:23:38

Modified files:
	C4             : SearchMarc.pm Search.pm 

Log message:
	(chris, read carefully)
	Replacing zebraserver and zebraport by zebradb in koha.conf . The zebra connexion can be done in a single variable "server:port/database". I used this in dirty searchMarc.pm as well as in Biblio.pm. I've replaced your code in Search.pm

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/C4/SearchMarc.pm.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/C4/Search.pm.diff?tr1=1.111&tr2=1.112&r1=text&r2=text

Patches:
Index: koha/C4/Search.pm
diff -u koha/C4/Search.pm:1.111 koha/C4/Search.pm:1.112
--- koha/C4/Search.pm:1.111	Tue Feb 14 04:00:23 2006
+++ koha/C4/Search.pm	Tue Feb 14 11:23:38 2006
@@ -30,7 +30,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.111 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.112 $' =~ /\d+/g;
           shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
@@ -60,14 +60,10 @@
     my ($search,$type)=@_;
     my $dbh=C4::Context->dbh();
     my $q;
-    my $host=C4::Context->config("zebraserver");
-    my $port=C4::Context->config("zebraport");
-    my $intranetdir=C4::Context->config("intranetdir");
-    my $database="koha3";
     my $Zconn;
     my $raw;
     eval {
-	$Zconn = new ZOOM::Connection("$host:$port/$database");
+	$Zconn = new ZOOM::Connection(C4::Context->config("zebradb"));
     };
     if ($@) {
 	warn "Error ", $@->code(), ": ", $@->message(), "\n";                  
@@ -78,7 +74,7 @@
 	foreach my $var (keys %$search) {
 	    $string.="$var=\"$search->{$var}\" ";
 	}	    
-	$Zconn->option(cqlfile => "$intranetdir/zebra/pqf.properties");
+	$Zconn->option(cqlfile => C4::Context->config("intranetdir")."/zebra/pqf.properties");
 	$Zconn->option(preferredRecordSyntax => "usmarc");
 	$q = new ZOOM::Query::CQL2RPN( $string, $Zconn);	
 	}
Index: koha/C4/SearchMarc.pm
diff -u koha/C4/SearchMarc.pm:1.54 koha/C4/SearchMarc.pm:1.55
--- koha/C4/SearchMarc.pm:1.54	Tue Feb 14 10:54:02 2006
+++ koha/C4/SearchMarc.pm	Tue Feb 14 11:23:38 2006
@@ -237,15 +237,12 @@
 	warn "QUERY : $query";
 	my $Zconn;
 	eval {
-		$Zconn = new ZOOM::Connection('localhost:2100/koha3');
+		$Zconn = new ZOOM::Connection(C4::Context->config("zebradb"));
 	};
-	warn "ICI";
-	$Zconn->option(cqlfile => "/usr/local/koha3/intranet/zebra/pqf.properties");
+	$Zconn->option(cqlfile => C4::Context->config("intranetdir")."/zebra/pqf.properties");
 	$Zconn->option(preferredRecordSyntax => "xml");
-	warn "LA";
 	my $q = new ZOOM::Query::CQL2RPN( $query, $Zconn);
 # 	warn "ERROR : ".$Zconn->errcode();
-	warn "Q : $q";
 	my $rs = $Zconn->search($q);
 	my $numresults=$rs->size();
 	if ($numresults eq 0) {
@@ -258,7 +255,7 @@
 	my @finalresult = ();
 	my @CNresults=();
 	my $totalitems=0;
-	$offset=0 unless $offset;
+	$offset=1 unless $offset;
 	# calculate max offset
 	my $maxrecordnum = $offset+$length<$numresults?$offset+$length:($numresults);
 	for (my $i=$offset-1; $i <= $maxrecordnum-1; $i++) {