alex/restaurant-search
1
Fork 0
Code Releases Activity

Output search results

Browse Source
This commit is contained in:
Alex Yatskov 2014-07-28 15:51:48 +09:00
parent 54a22051b6
commit a9f03b30f6
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
client/application.js
View File

@ -29,19 +29,19 @@ function onAdjust(name, value) {
function onSearch() {
var params = {
'keyword': $('#keyword').val(),
'minScore': parseInt($('#minScore').val()),
'hintSteps': parseInt($('#hintSteps').val()),
'maxResults': parseInt($('#maxResults').val()),
'useLocalScale': true,
'useRelativeScale': true
keyword: $('#keyword').val(),
searchRange: { min: -1.0, max: 1.0 },
minScore: parseInt($('#minScore').val()),
hintSteps: parseInt($('#hintSteps').val()),
maxResults: parseInt($('#maxResults').val()),
useLocalScale: true,
useRelativeScale: true
};
$.getJSON('/node/search', params, function(results) {
console.log(results);
window.adjuster = {
searchParams: results.params,
searchRange: params.searchRange,
minScore: params.minScore,
hintSteps: params.hintSteps,
maxResults: params.maxResults
@ -51,8 +51,7 @@ function onSearch() {
window.grapher.setColumns(results.columns);
window.grapher.setValueChangedListener(onAdjust);
// var results = searchData(searchParams, minScore);
// outputResults(results, maxResults);
outputResults(results.items, params.maxResults);
$('#query').text(params.keyword);
$('#useLocalScale').prop('checked', useLocalScale);

43
server/db/search.js
View File

@ -56,8 +56,8 @@ function searchProjection(searchParams, minScore, feature, range, steps) {
searchStepper(range, steps, function(position) {
testParams[feature] = position;
results.push({
'sample': position,
'values': searchData(testParams, minScore)
sample: position,
values: searchData(testParams, minScore)
});
});
@ -73,9 +73,9 @@ function searchProjection2d(searchParams, minScore, feature1, feature2, range, s
searchStepper(range, steps, function(sampleY) {
testParams[feature2] = sampleY;
results.push({
'sampleX': sampleX,
'sampleY': sampleY,
'values': searchData(testParams, minScore)
sampleX: sampleX,
sampleY: sampleY,
values: searchData(testParams, minScore)
});
});
});
@ -95,8 +95,8 @@ function searchBuildHints(searchParams, minScore, feature, range, steps) {
var hints = [];
_.each(projection, function(result) {
hints.push({
'sample': result.sample,
'count': result.values.length
sample: result.sample,
count: result.values.length
});
});
@ -116,9 +116,9 @@ function searchBuildHints2d(searchParams, minScore, feature1, feature2, range, s
var hints = [];
_.each(projection, function(result) {
hints.push({
'sampleX': result.sampleX,
'sampleY': result.sampleY,
'count': result.values.length
sampleX: result.sampleX,
sampleY: result.sampleY,
count: result.values.length
});
});
@ -130,29 +130,30 @@ module.exports.getKeywords = function() {
}
module.exports.execQuery = function(query) {
var searchParams = db_keywords[query.keyword];
var searchRange = { 'min': -1.0, 'max': 1.0 };
var graphColumns = { };
var searchParams = db_keywords[query.keyword];
var searchResults = searchData(searchParams, query.minScore);
var graphColumns = { };
for (var feature in searchParams) {
var hints = searchBuildHints(
var searchHints = searchBuildHints(
searchParams,
query.minScore,
feature,
searchRange,
query.searchRange,
query.hintSteps
);
graphColumns[feature] = {
'color': '#607080',
'value': searchParams[feature],
'hints': hints,
'steps': query.hintSteps
color: '#607080',
value: searchParams[feature],
hints: searchHints,
steps: query.hintSteps
}
}
return {
'columns': graphColumns,
'params': searchParams
columns: graphColumns,
params: searchParams,
items: searchResults
};
}