Browse Source

Merge branch 'master' into reverse

Conflicts:
	query/search.js
pull/5/head
Harish Krishna 10 years ago
parent
commit
def1b141f2
  1. 1
      README.md
  2. 2
      controller/search.js

1
README.md

@ -31,6 +31,7 @@ $ npm run unit
``` ```
### Running Functional Tests ### Running Functional Tests
(this requires the server to be running)
```bash ```bash
$ npm run ciao $ npm run ciao

2
controller/search.js

@ -21,7 +21,7 @@ function setup( backend, query ){
// handle backend errors // handle backend errors
if( err ){ return next( err ); } if( err ){ return next( err ); }
if( data && data.hits && data.hits.total){ if( data && data.hits && data.hits.total && Array.isArray(data.hits.hits)){
docs = data.hits.hits.map( function( hit ){ docs = data.hits.hits.map( function( hit ){
return hit._source; return hit._source;
}); });

Loading…
Cancel
Save