[Koha-cvs] koha/C4 Context.pm Search.pm [dev_week]

[Tumer Garip]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Tumer Garip <tgarip1957>	06/06/04 22:50:33

Modified files:
	C4             : Context.pm Search.pm 

Log message:
	We do not hard code cql2rpn conversion file in context.pm our koha.xml configuration file already describes the path for this file.
	At cql searching we use method CQL not CQL2RPN as the cql2rpn conversion file is defined at server level

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Context.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.18.2.5.2.6&r2=1.18.2.5.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Search.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.99.2.11.2.3&r2=1.99.2.11.2.4

Patches:
Index: Context.pm
===================================================================
RCS file: /sources/koha/koha/C4/Context.pm,v
retrieving revision 1.18.2.5.2.6
retrieving revision 1.18.2.5.2.7
diff -u -b -r1.18.2.5.2.6 -r1.18.2.5.2.7
--- Context.pm	2 Jun 2006 23:11:24 -0000	1.18.2.5.2.6
+++ Context.pm	4 Jun 2006 22:50:33 -0000	1.18.2.5.2.7
@@ -15,7 +15,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Context.pm,v 1.18.2.5.2.6 2006/06/02 23:11:24 kados Exp $
+# $Id: Context.pm,v 1.18.2.5.2.7 2006/06/04 22:50:33 tgarip1957 Exp $
 package C4::Context;
 use strict;
 use DBI;
@@ -25,7 +25,7 @@
 	qw($context),
 	qw(@context_stack);
 
-$VERSION = do { my @v = '$Revision: 1.18.2.5.2.6 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.18.2.5.2.7 $' =~ /\d+/g;
 		shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
@@ -434,7 +434,7 @@
 	eval {
 		$Zconn=new ZOOM::Connection($context->config("hostname"),$port,databaseName=>$context->{"config"}->{$server},
 		preferredRecordSyntax => "USmarc",elementSetName=> "F");
-		$Zconn->option(cqlfile => "/koha/etc/pqf.properties");
+		
 	};
 	if ($@){
 ###Uncomment the lines below if you want to automatically restart your zebra if its stop
@@ -445,7 +445,7 @@
 	#	goto "retry";
 	#	}else{
 	#	warn "Error ", $@->code(), ": ", $@->message(), "\n";
-	#	$Zconn="error";
+		$Zconn="error";
 	#	return $Zconn;
 	#	}
 	}
@@ -812,6 +812,10 @@
 
 =cut
 # $Log: Context.pm,v $
+# Revision 1.18.2.5.2.7  2006/06/04 22:50:33  tgarip1957
+# We do not hard code cql2rpn conversion file in context.pm our koha.xml configuration file already describes the path for this file.
+# At cql searching we use method CQL not CQL2RPN as the cql2rpn conversion file is defined at server level
+#
 # Revision 1.18.2.5.2.6  2006/06/02 23:11:24  kados
 # Committing my working dev_week. It's been tested only with
 # searching, and there's quite a lot of config stuff to set up

Index: Search.pm
===================================================================
RCS file: /sources/koha/koha/C4/Search.pm,v
retrieving revision 1.99.2.11.2.3
retrieving revision 1.99.2.11.2.4
diff -u -b -r1.99.2.11.2.3 -r1.99.2.11.2.4
--- Search.pm	2 Jun 2006 23:11:24 -0000	1.99.2.11.2.3
+++ Search.pm	4 Jun 2006 22:50:33 -0000	1.99.2.11.2.4
@@ -35,7 +35,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.99.2.11.2.3 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.99.2.11.2.4 $' =~ /\d+/g;
           shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
@@ -1320,7 +1320,7 @@
 	if ($rpn) {
 		$newq= new ZOOM::Query::PQF($cql_query);
 	} else {
-		$newq = new ZOOM::Query::CQL2RPN($cql_query,$oConnection);
+		$newq = new ZOOM::Query::CQL($cql_query,$oConnection);
 	}
 } else {
 	$newq= new ZOOM::Query::PQF($query);