Initital try with ES aggregations.

matteodem · Apr 24, 2017 · ecd4e1d · ecd4e1d
1 parent 2e1b713
commit ecd4e1d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/packages/easysearch:core/lib/core/search-collection.js b/packages/easysearch:core/lib/core/search-collection.js
@@ -189,7 +189,8 @@ class SearchCollection {
           () => this.changed(
             collectionName,
             'searchCount' + definitionString,
-            { count: cursor.mongoCursor.count && cursor.mongoCursor.count() || 0 }
+            // TODO: I substituted cursor.mongoCursor.count with cursor.count. will this break things?
+            { count: cursor.count && cursor.count() || 0 }
           ),
           collectionScope._indexConfiguration.countUpdateIntervalMs
         );

diff --git a/packages/easysearch:elasticsearch/lib/engine.js b/packages/easysearch:elasticsearch/lib/engine.js
@@ -161,7 +161,7 @@ if (Meteor.isServer) {
     }
 
     indexConfig.searchCollection = new ESSearchCollection(indexConfig, this);
-    indexConfig.mongoCollection = indexConfig.searchCollection._hitsCollection;
+    indexConfig.mongoCollection = indexConfig.searchCollection._collection;
 
     if (Meteor.isServer) {
       indexConfig.elasticSearchClient = new elasticsearch.Client(this.config.client);
@@ -218,7 +218,7 @@ if (Meteor.isServer) {
           })
         }, { limit: options.search.limit });
       } else {
-        cursor = EasySearch.ESCursor.emptyCursor;
+        cursor = ESCursor.emptyCursor;
       }
 
       fut['return'](new ESCursor(cursor, total, true, null, aggs));

diff --git a/packages/easysearch:elasticsearch/lib/search-collection.js b/packages/easysearch:elasticsearch/lib/search-collection.js
@@ -40,7 +40,7 @@ class ESSearchCollection extends SearchCollection {
     let mongoCursor = this._getMongoCursor(searchDefinition, options);
 
     if (!_.isNumber(count)) {
-      return new ESCursor(mongoCursor, 0, false, aggs);
+      return new ESCursor(mongoCursor, 0, false, null, aggs);
     }
 
     return new ESCursor(mongoCursor, count, true, publishHandle, aggs);