php/archived-pecl-search-engine-solr
1
0
Fork 0
mirror of https://github.com/php/pecl-search_engine-solr.git synced 2026-03-23 22:52:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement Request #68384: Allow Switching between DisMax and EDisMax query parsers

Browse Source 
New Methods Introduced in SolrDisMaxQuery:
SolrDisMaxQuery SolrQuery::useDisMaxQueryParser()
SolrDisMaxQuery SolrQuery::useEDisMaxQueryParser()
To Allow switching between query parsers
This commit is contained in:
Omar Shaban
2014-11-10 02:11:16 +02:00
parent 33e59582c1
commit cedd00f28e
4 changed files with 91 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/documentation.php
View File

@@ -1387,6 +1387,16 @@ class SolrDisMaxQuery extends SolrQuery {
public function ___construct($q = null) {}
/**
* Switch Query Parser to dismax
*/
public function useDisMaxQueryParser() {}
/**
* Switch Query Parser to edismax
*/
public function useEDisMaxQueryParser() {}
/**
* Set Query Alternate (q.alt parameter)
* When the main q parameter is not specified or is blank. The q.alt parameter is used

74
php_solr_dismax_query.c
View File

@@ -1,13 +1,12 @@
#include "php_solr.h"
extern function_entry;
//extern SOLR_ARG_PASS_BY_REF_FALSE;
//extern SOLR_ARG_PASS_REMAINING_BY_REF_FALSE;
//extern SOLR_METHOD_RETURN_REFERENCE_FALSE;
/*extern solr_ce_SolrQuery;*/
zend_class_entry *solr_ce_SolrDixMaxQuery;
ZEND_BEGIN_ARG_INFO_EX(SolrDisMaxQuery_zero_arg_info, SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(SolrDisMaxQuery_addQueryField_args, SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)
ZEND_ARG_INFO(0, field_name)
ZEND_ARG_INFO(0, boost)
@@ -64,6 +63,8 @@ static zend_function_entry solr_dismax_query_methods[] = {
PHP_ME(SolrDisMaxQuery, setBoostFunction, SolrDisMaxQuery_setBoostFunction_args, ZEND_ACC_PUBLIC)
PHP_ME(SolrDisMaxQuery, setMinimumMatch, SolrDisMaxQuery_setMinimumMatch_args, ZEND_ACC_PUBLIC)
PHP_ME(SolrDisMaxQuery, setTieBreaker, SolrDisMaxQuery_setTieBreaker_args, ZEND_ACC_PUBLIC)
PHP_ME(SolrDisMaxQuery, useDisMaxQueryParser, SolrDisMaxQuery_zero_arg_info, ZEND_ACC_PUBLIC)
PHP_ME(SolrDisMaxQuery, useEDisMaxQueryParser, SolrDisMaxQuery_zero_arg_info, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
@@ -84,6 +85,10 @@ void init_solr_dismax_query(TSRMLS_D){
PHP_METHOD(SolrDisMaxQuery, __construct)
{
zval *param_value = NULL;
solr_char_t *deftype_param_name = "defType", *deftype_param_value = "dismax";
int deftype_param_name_len = strlen("defType"), deftype_param_value_len = strlen("dismax");
int param_name_len = strlen("defType"), param_value_len = strlen("dismax");
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z", &param_value) == FAILURE){
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
RETURN_NULL();
@@ -93,14 +98,63 @@ PHP_METHOD(SolrDisMaxQuery, __construct)
}else{
zend_call_method_with_1_params(&getThis(), solr_ce_SolrDixMaxQuery, &solr_ce_SolrDixMaxQuery->parent->constructor, "__construct", NULL, param_value);
}
solr_add_simple_list_param(
solr_add_or_set_normal_param(
getThis(),
(solr_char_t *)"defType",
sizeof("defType")-1,
(solr_char_t *)"dismax",
sizeof("dismax")-1 TSRMLS_CC
deftype_param_name,
deftype_param_name_len,
deftype_param_value,
deftype_param_value_len,
0 TSRMLS_CC
);
}
/* }}} */
/* {{{ proto SolrQuery::useDisMaxQueryParser()
Switch Query Parser to dismax */
PHP_METHOD(SolrDisMaxQuery, useDisMaxQueryParser)
{
solr_char_t *param_name = "defType", *param_value = "dismax";
int param_name_len = strlen("defType"), param_value_len = strlen("dismax"), result=1;
result = solr_add_or_set_normal_param(
getThis(),
param_name,
param_name_len,
param_value,
param_value_len,
0 TSRMLS_CC
);
if(result != SUCCESS)
{
RETURN_NULL();
}
SOLR_RETURN_THIS();
}
/* }}} */
/* {{{ proto SolrQuery::useDisMaxQueryParser()
Switch Query Parser to edismax */
PHP_METHOD(SolrDisMaxQuery, useEDisMaxQueryParser)
{
solr_char_t *pname = "defType", *param_value = "edismax";
int pname_len = strlen("defType"), param_value_len = strlen("edismax"), result=1;
result = solr_add_or_set_normal_param(
getThis(),
pname,
pname_len,
param_value,
param_value_len,
0 TSRMLS_CC
);
if(result != SUCCESS)
{
RETURN_NULL();
}
SOLR_RETURN_THIS();
}
/* }}} */

2
php_solr_dismax_query.h
View File

@@ -23,5 +23,7 @@ PHP_METHOD(SolrDisMaxQuery, removeBoostQuery);
PHP_METHOD(SolrDisMaxQuery, setBoostFunction);
PHP_METHOD(SolrDisMaxQuery, setMinimumMatch);
PHP_METHOD(SolrDisMaxQuery, setTieBreaker);
PHP_METHOD(SolrDisMaxQuery, useDisMaxQueryParser);
PHP_METHOD(SolrDisMaxQuery, useEDisMaxQueryParser);
#endif /* SOLR_DISMAX_QUERY_H_ */

15
tests/112.solrdismaxquery_query_parser.phpt Normal file
View File

@@ -0,0 +1,15 @@
--TEST--
SolrDisMaxQuery - QueryParser Switch
--FILE--
<?php
$dismaxQuery = new SolrDisMaxQuery("hard drive");
echo $dismaxQuery.PHP_EOL;
$dismaxQuery->useDisMaxQueryParser();
echo $dismaxQuery.PHP_EOL;
$dismaxQuery->useEDisMaxQueryParser();
echo $dismaxQuery.PHP_EOL;
?>
--EXPECTF--
q=hard drive&defType=edismax
q=hard drive&defType=dismax
q=hard drive&defType=edismax