Navigation Menu

Skip to content

Commit

Permalink
Don't expose internal columns to the search result
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Aug 22, 2012
1 parent c3e5c9a commit 31c95d9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 37 deletions.
10 changes: 9 additions & 1 deletion lib/api/2011-02-01/search.js
Expand Up @@ -39,7 +39,15 @@ function formatSelectResults(data) {
var records = data[0].slice(2);
var results = records.map(function(record) {
var object = {};
var id;
columnNames.forEach(function(columnName, index) {
// bind internal "_key" column to the "id"
if (columnName == '_key') {
id = record[index];
return;
}
// don't expose any internal column
if (columnName[0] == '_') return;
if (Array.isArray(record[index])) {
// vector column
object[columnName] = record[index];
Expand All @@ -49,7 +57,7 @@ function formatSelectResults(data) {
}
});
return {
id: object._key[0],
id: id,
data: object
};
});
Expand Down
36 changes: 0 additions & 36 deletions test/api-search.test.js
Expand Up @@ -84,8 +84,6 @@ suite('Search API', function() {
hit: [{
id: 'id3',
data: {
_id: [3],
_key: ['id3'],
address: ['Hongo, Tokyo, Japan'],
description: [''],
email_address: ['info@clear-code.com'],
Expand Down Expand Up @@ -119,8 +117,6 @@ suite('Search API', function() {
{
id: 'id1',
data: {
_id: [1],
_key: ['id1'],
address: ['Shibuya, Tokyo, Japan'],
description: [''],
email_address: ['info@razil.jp'],
Expand All @@ -132,8 +128,6 @@ suite('Search API', function() {
{
id: 'id3',
data: {
_id: [3],
_key: ['id3'],
address: ['Hongo, Tokyo, Japan'],
description: [''],
email_address: ['info@clear-code.com'],
Expand All @@ -145,8 +139,6 @@ suite('Search API', function() {
{
id: 'id9',
data: {
_id: [9],
_key: ['id9'],
address: ['Tokyo, Japan'],
description: [''],
email_address: [''],
Expand Down Expand Up @@ -180,8 +172,6 @@ suite('Search API', function() {
{
id: 'id1',
data: {
_id: [1],
_key: ['id1'],
address: ['Shibuya, Tokyo, Japan'],
description: [''],
email_address: ['info@razil.jp'],
Expand All @@ -193,8 +183,6 @@ suite('Search API', function() {
{
id: 'id3',
data: {
_id: [3],
_key: ['id3'],
address: ['Hongo, Tokyo, Japan'],
description: [''],
email_address: ['info@clear-code.com'],
Expand All @@ -206,8 +194,6 @@ suite('Search API', function() {
{
id: 'id9',
data: {
_id: [9],
_key: ['id9'],
address: ['Tokyo, Japan'],
description: [''],
email_address: [''],
Expand Down Expand Up @@ -250,8 +236,6 @@ suite('Search API', function() {
{
id: 'id1',
data: {
_id: [1],
_key: ['id1'],
address: ['Shibuya, Tokyo, Japan'],
description: [''],
email_address: ['info@razil.jp'],
Expand All @@ -263,8 +247,6 @@ suite('Search API', function() {
{
id: 'id3',
data: {
_id: [3],
_key: ['id3'],
address: ['Hongo, Tokyo, Japan'],
description: [''],
email_address: ['info@clear-code.com'],
Expand Down Expand Up @@ -299,8 +281,6 @@ suite('Search API', function() {
{
id: 'id3',
data: {
_id: [3],
_key: ['id3'],
address: ['Hongo, Tokyo, Japan'],
description: [''],
email_address: ['info@clear-code.com'],
Expand All @@ -312,8 +292,6 @@ suite('Search API', function() {
{
id: 'id9',
data: {
_id: [9],
_key: ['id9'],
address: ['Tokyo, Japan'],
description: [''],
email_address: [''],
Expand Down Expand Up @@ -379,8 +357,6 @@ suite('Search API', function() {
{
id: 'id1',
data: {
_id: [1],
_key: ['id1'],
address: ['Shibuya, Tokyo, Japan'],
description: [''],
email_address: ['info@razil.jp'],
Expand All @@ -392,8 +368,6 @@ suite('Search API', function() {
{
id: 'id3',
data: {
_id: [3],
_key: ['id3'],
address: ['Hongo, Tokyo, Japan'],
description: [''],
email_address: ['info@clear-code.com'],
Expand All @@ -405,8 +379,6 @@ suite('Search API', function() {
{
id: 'id9',
data: {
_id: [9],
_key: ['id9'],
address: ['Tokyo, Japan'],
description: [''],
email_address: [''],
Expand Down Expand Up @@ -458,17 +430,13 @@ suite('Search API', function() {
{
id: 'id2',
data: {
_id: [2],
_key: ['id2'],
realname: ['Pumpkin Man'],
nickname: ['Jack-o\'-Lantern']
}
},
{
id: 'id1',
data: {
_id: [1],
_key: ['id1'],
realname: ['Jack Sparrow'],
nickname: ['Captain']
}
Expand Down Expand Up @@ -502,8 +470,6 @@ suite('Search API', function() {
{
id: 'id1',
data: {
_id: [1],
_key: ['id1'],
realname: ['Jack Sparrow'],
nickname: ['Captain']
}
Expand Down Expand Up @@ -538,8 +504,6 @@ suite('Search API', function() {
{
id: 'id2',
data: {
_id: [2],
_key: ['id2'],
realname: ['Pumpkin Man'],
nickname: ['Jack-o\'-Lantern']
}
Expand Down

0 comments on commit 31c95d9

Please sign in to comment.