From a04cabaccf5a9df2fdd45e4c490153570c6188af Mon Sep 17 00:00:00 2001 From: tgarip1957 Date: Sun, 4 Jun 2006 22:50:33 +0000 Subject: [PATCH] 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 --- C4/Context.pm | 8 ++++++-- C4/Search.pm | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/C4/Context.pm b/C4/Context.pm index 4696dade91..2937a944ee 100644 --- a/C4/Context.pm +++ b/C4/Context.pm @@ -434,7 +434,7 @@ retry: 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 @@ retry: # goto "retry"; # }else{ # warn "Error ", $@->code(), ": ", $@->message(), "\n"; - # $Zconn="error"; + $Zconn="error"; # return $Zconn; # } } @@ -812,6 +812,10 @@ Andrew Arensburger =cut # $Log$ +# 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 diff --git a/C4/Search.pm b/C4/Search.pm index f5b3620e66..7b373b74ed 100755 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -1320,7 +1320,7 @@ if ($cql) { 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); -- 2.39.5