Skip to content

Commit

Permalink
Collections
Browse files Browse the repository at this point in the history
  • Loading branch information
Hexagon committed Feb 17, 2017
1 parent bbf0ce7 commit 4fa3e84
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,5 @@ $RECYCLE.BIN/
temp.idx

# Local test script
local.*.js
local.*.js
local/
15 changes: 12 additions & 3 deletions lib/Thinker.js
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ Thinker.prototype.find = function (params) {
}

// Restore document ids, append meta
if (params.collect) resultSet.collection = [];
if (params.collect) resultSet.collection = {};

for (i = 0; i < resultSet.documents.length; i++) {

Expand All @@ -423,9 +423,18 @@ Thinker.prototype.find = function (params) {
resultSet.documents[i].metadata = self.index.getMetadata(docIdx);
resultSet.documents[i].id = self.index.docIndexToId(resultSet.documents[i].id);

// Need to collect?
// Need to collect?
if (params.collect && resultSet.documents[i].metadata && resultSet.documents[i].metadata[params.collect]) {
resultSet.collection.push(resultSet.documents[i].metadata[params.collect]);
var pc = resultSet.documents[i].metadata[params.collect];
if ( pc ) {
for(var j = 0; j < pc.length; j++) {
if(!resultSet.collection[pc[j]]) {
resultSet.collection[pc[j]] = [];
}
resultSet.collection[pc[j]].push(resultSet.documents[i].id);
}
}
}

}
Expand All @@ -442,7 +451,7 @@ Thinker.prototype.find = function (params) {
}

// Limit results, if needed
if (params.limit && resultSet.length > params.limit) {
if (params.limit && resultSet.documents.length > params.limit) {
resultSet.documents = resultSet.documents.slice(0, params.limit);
}
resultSet.returnedHits = resultSet.documents.length;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "thinker-fts",
"version": "1.1.2",
"version": "1.1.3",
"description": "Pure Javascript/Node.js in-memory full text search engine.",
"author": "Hexagon <github.com/hexagon>",
"contributors": [{
Expand Down
2 changes: 1 addition & 1 deletion test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1748,7 +1748,7 @@ describe('Tags', function () {
} );

it('Should return one result', function () {
result.documents.length.should.equal(3);
result.documents.length.should.equal(1);
});

it('Should have totalHits == 3', function () {
Expand Down

0 comments on commit 4fa3e84

Please sign in to comment.