Skip to content

Remove spaces before numbers in order to avoid search errors #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 4, 2017
Merged

Remove spaces before numbers in order to avoid search errors #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3940142
Add content type to product requests
avstudnitz Apr 18, 2017
59a56f4
Remove spaces before numbers in query text in order to avoid search e…
avstudnitz Apr 18, 2017
637e956
Merge branch 'number-queries' of https://github.com/integer-net/solr-…
avstudnitz Apr 25, 2017
734474e
Fix unit tests
avstudnitz Apr 25, 2017
0a5f0c1
Add unit test for query containing numbers
avstudnitz Apr 25, 2017
27f1554
Remove repeated whitespace characters
avstudnitz Apr 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Solr/Query/Params/FilterQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public function addPriceRangeFilterByMinMax($minPrice, $maxPrice = 0.0)
*/
public function buildFilterQuery($storeId, $attributeToReset = '')
{
$filterQuery = 'store_id:' . $storeId;
$filterQuery = 'content_type:product AND store_id:' . $storeId;
if ($this->isCategoryPage) {
$filterQuery .= ' AND is_visible_in_catalog_i:1';
} else {
Expand Down
7 changes: 6 additions & 1 deletion src/Solr/Query/SearchString.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,15 @@ public function getRawString()
return $this->rawString;
}

/**
* Remove spaces before numbers in order to avoid search errors
*
* @return string
*/
public function getEscapedString()
{
if ($this->escapedString === null) {
$this->escapedString = $this->escape($this->getRawString());
$this->escapedString = preg_replace(['/\s+([0-9])/','/\s+/'], ['$1', ' '], $this->escape($this->getRawString()));
}
return $this->escapedString;
}
Expand Down
14 changes: 11 additions & 3 deletions test/Solr/Query/SearchQueryBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public static function dataQueryBuilder()
$defaultPagination = PaginationStub::defaultPagination();
$defaultExpectedParams = [
'q.op' => ResultsConfig::SEARCH_OPERATOR_AND,
'fq' => "store_id:$defaultStoreId AND is_visible_in_search_i:1",
'fq' => "content_type:product AND store_id:$defaultStoreId AND is_visible_in_search_i:1",
'fl' => 'result_html_list_nonindex,result_html_grid_nonindex,score,sku_s,name_s,product_id',
'sort' => 'score desc',
'facet' => 'true',
Expand All @@ -91,11 +91,19 @@ public static function dataQueryBuilder()
FilterQueryBuilder::noFilterQueryBuilder($defaultResultConfig), $defaultPagination, new SearchString('foo bar'),
new Query($defaultStoreId, 'foo bar~0.7', 0, PaginationStub::DEFAULT_PAGESIZE, $defaultExpectedParams)
],
'default_spaces' => [$defaultStoreId, $defaultResultConfig, FuzzyConfigBuilder::defaultConfig()->build(),
FilterQueryBuilder::noFilterQueryBuilder($defaultResultConfig), $defaultPagination, new SearchString('foo bar'),
new Query($defaultStoreId, 'foo bar~0.7', 0, PaginationStub::DEFAULT_PAGESIZE, $defaultExpectedParams)
],
'default_numbers' => [$defaultStoreId, $defaultResultConfig, FuzzyConfigBuilder::defaultConfig()->build(),
FilterQueryBuilder::noFilterQueryBuilder($defaultResultConfig), $defaultPagination, new SearchString('foo 1 bar 2'),
new Query($defaultStoreId, 'foo1 bar2~0.7', 0, PaginationStub::DEFAULT_PAGESIZE, $defaultExpectedParams)
],
'alternative' => [1, ResultConfigBuilder::alternativeConfig()->build(), FuzzyConfigBuilder::inactiveConfig()->build(),
FilterQueryBuilder::noFilterQueryBuilder($defaultResultConfig), PaginationStub::alternativePagination(), new SearchString('"foo bar"'),
new Query(1, 'attribute1_t:""foo bar""~100^0 OR attribute2_t:""foo bar""~100^0 OR category_name_t_mv:""foo bar""~100^1', 0, 24, [
'q.op' => ResultsConfig::SEARCH_OPERATOR_OR,
'fq' => "store_id:1 AND is_visible_in_search_i:1",
'fq' => "content_type:product AND store_id:1 AND is_visible_in_search_i:1",
'sort' => 'attribute1_s desc',
'f.price_f.facet.interval.set' => [
"(0.000000,10.000000]", "(10.000000,20.000000]", "(20.000000,50.000000]", "(50.000000,100.000000]", "(100.000000,200.000000]",
Expand All @@ -111,7 +119,7 @@ public static function dataQueryBuilder()
->addPriceRangeFilterByMinMax(13,37),
$defaultPagination, new SearchString('foo bar'),
new Query($defaultStoreId, 'foo bar~0.7', 0, PaginationStub::DEFAULT_PAGESIZE, [
'fq' => 'store_id:0 AND is_visible_in_search_i:1 AND attribute1_facet:blue AND category:42 AND price_f:[13.000000 TO 37.000000]'
'fq' => 'content_type:product AND store_id:0 AND is_visible_in_search_i:1 AND attribute1_facet:blue AND category:42 AND price_f:[13.000000 TO 37.000000]'
] + $defaultExpectedParams)
]
];
Expand Down