Skip to content

merged bucketed search code #31

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+94 −23
Open

merged bucketed search code #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
117 changes: 94 additions & 23 deletions unbxdSearch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,11 @@ var unbxdSearchInit = function(jQuery, Handlebars){
,getFacetStats : ""
,processFacetStats : function(obj){}
,setDefaultFilters : function(){}
,enableBuckets: false
,noOfBuckets: 5
,bucketSize: 5
,bucketField: ""
,bucketResultSetTemp: ""
,fields : []
,onNoResult : function(obj){}
,noEncoding : false
Expand Down Expand Up @@ -714,6 +719,13 @@ var unbxdSearchInit = function(jQuery, Handlebars){
self.setPage(self.getPage() + 1)
.callResults(self.paintProductPage);
}
if(!self.enableBuckets){
var wind = jQuery(window),docu = jQuery(document);
if((wind.scrollTop()) > (docu.height() - wind.height() - self.options.heightDiffToTriggerNextPage) && self.currentNumberOfProducts < self.totalNumberOfProducts && !self.isLoading){
self.setPage(self.getPage() + 1)
.callResults(self.paintProductPage);
}
}
});
}

Expand Down Expand Up @@ -1106,6 +1118,11 @@ var unbxdSearchInit = function(jQuery, Handlebars){

if(this.options.fields.length){
nonhistoryPath += '&fields=' + this.options.fields.join(',');
if(this.options.enableBuckets){
url += "&bucket.field=" + this.options.bucketField;
url += "&rows=" + this.options.noOfBuckets;
url += "&bucket.limit=" + this.options.bucketSize;
}
}

if(this.options.facetMultiSelect)
Expand Down Expand Up @@ -1302,6 +1319,12 @@ var unbxdSearchInit = function(jQuery, Handlebars){

this.totalNumberOfProducts = 0;

if(obj.hasOwnProperty("buckets")){
totalProducts = obj.buckets.totalProducts;
}else{
totalProducts = obj.response.numberOfProducts;
}

this.currentNumberOfProducts = 0;

if(obj.hasOwnProperty('redirect')) {
Expand All @@ -1317,19 +1340,24 @@ var unbxdSearchInit = function(jQuery, Handlebars){
}

if(obj.hasOwnProperty('didYouMean')){
if(obj.response.numberOfProducts == 0 ) { //> this.options.pageSize){
if(this.params.extra.page > 1)
this.params.extra.page = this.params.extra.page - 1;
if (totalProducts == 0) {
if( (obj.buckets && obj.didYouMean[0].suggestion) || (obj.response && obj.response.numberOfProducts == 0)){
if(this.params.extra.page > 1){
this.params.extra.page = this.params.extra.page - 1;
}

this.params.query = obj.didYouMean[0].suggestion;

if(!this.compiledSpellCheckTemp)
this.compiledSpellCheckTemp = Handlebars.compile(this.options.spellCheckTemp);

jQuery(this.options.spellCheck).html(this.compiledSpellCheckTemp({suggestion : obj.didYouMean[0].suggestion})).show();

facetsAlso ? this.callResults(this.paintAfterSpellCheck) : this.callResults(this.paintOnlyResultSet) ;
this.params.query = obj.didYouMean[0].suggestion;

if (!this.compiledSpellCheckTemp) {
this.compiledSpellCheckTemp = Handlebars.compile(this.options.spellCheckTemp);
}

jQuery(this.options.spellCheck).html(this.compiledSpellCheckTemp({
suggestion: obj.didYouMean[0].suggestion
})).show();

facetsAlso ? this.callResults(this.paintAfterSpellCheck) : this.callResults(this.paintOnlyResultSet) ;
}
}else{

this.params.query = obj.searchMetaData.queryParams.q; //obj.didYouMean[0].suggestion;
Expand Down Expand Up @@ -1371,7 +1399,13 @@ var unbxdSearchInit = function(jQuery, Handlebars){
if("error" in obj)
return;

if(!obj.response.numberOfProducts){
if(obj.hasOwnProperty("buckets")){
totalProducts = obj.buckets.totalProducts;
}else{
totalProducts = obj.response.numberOfProducts;
}

if(!totalProducts){
this.reset();

this.options.onNoResult.call(this,obj);
Expand All @@ -1382,27 +1416,64 @@ var unbxdSearchInit = function(jQuery, Handlebars){
if(!this.compiledSearchQueryTemp)
this.compiledSearchQueryTemp = Handlebars.compile(this.options.searchQueryDisplayTemp);

this.productStartIdx = (this.isUsingPagination()) ? obj.response.start + 1 : 1;
this.productEndIdx = (this.getPage() * this.getPageSize() <= obj.response.numberOfProducts) ?
this.getPage() * this.getPageSize() : obj.response.numberOfProducts;
this.totalPages = Math.ceil(obj.response.numberOfProducts/this.getPageSize());
if(!obj.buckets){
this.productStartIdx = (this.isUsingPagination()) ? obj.response.start + 1 : 1;
this.productEndIdx = (this.getPage() * this.getPageSize() <= obj.response.numberOfProducts) ? this.getPage() * this.getPageSize() : obj.response.numberOfProducts;
this.totalPages = Math.ceil(obj.response.numberOfProducts/this.getPageSize());
}else{
this.productStartIdx = (this.isUsingPagination()) ? ( obj.searchMetaData.queryParams.hasOwnProperty("start") ? obj.searchMetaData.queryParams.start : 0 ) + 1 : 1;
this.productEndIdx = (this.getPage() * this.getPageSize() <= obj.buckets.numberOfBuckets) ? this.getPage() * this.getPageSize() : obj.buckets.numberOfBuckets;
this.totalPages = Math.ceil(obj.buckets.numberOfBuckets / this.getPageSize());
}

jQuery(this.options.searchQueryDisplay).html(this.compiledSearchQueryTemp({
query : obj.searchMetaData.queryParams.q
,numberOfProducts : obj.response.numberOfProducts
,numberOfProducts : obj.hasOwnProperty("buckets") ? obj.buckets.totalProducts : obj.response.numberOfProducts
,start: this.productStartIdx
,end: this.productEndIdx
})).show();

this.paintSort(obj);
this.paintPageSize(obj);
this.paintPagination(obj);
obj.response.products = obj.response.products.map(function(product){
product['unbxdprank'] = obj.response.start + start;
start += 1;
return product;
});
if(obj.response){
obj.response.products = obj.response.products.map(function(product){
product['unbxdprank'] = obj.response.start + start;
start += 1;
return product;
});
}

if(this.options.enableBuckets){
var i = [];
for (var a in obj.buckets){
if (obj.buckets.hasOwnProperty(a)) {
if ("totalProducts" === a || "numberOfBuckets" === a || "" === a) continue;
i.push({
name: a,
numberOfProducts: obj.buckets[a].numberOfProducts,
products: obj.buckets[a].products
});
}
}
}

if(this.getClass(this.options.bucketResultSetTemp) == "Function"){
this.options.bucketResultSetTemp.call(this,{buckets: i});
}else{
if (!this.compiledBucketResultTemp) {
this.compiledBucketResultTemp = Handlebars.compile(this.options.bucketResultSetTemp);
}
jQuery(this.options.searchResultContainer).append(this.compiledBucketResultTemp({
buckets: i,
query: obj.searchMetaData.queryParams.q,
numberOfProducts: this.options.enableBuckets ? obj.buckets.totalProducts : obj.response.numberOfProducts
}));
if(typeof this.options.onIntialResultLoad ){
this.options.onIntialResultLoad.call(this,obj);
}
}
}else{
if(this.getClass(this.options.searchResultSetTemp) == 'Function'){
this.options.searchResultSetTemp.call(this,obj);
} else if (this.options.searchResultSetTemp !== null && typeof this.options.searchResultSetTemp === 'object') {
Expand Down Expand Up @@ -1584,7 +1655,7 @@ var unbxdSearchInit = function(jQuery, Handlebars){
if("error" in obj)
return;

if(!obj.response.numberOfProducts)
if(!obj.buckets && !obj.numberOfProducts)
return this;

var facets = obj.facets
Expand Down