Fix total count for ES 7.5

web/js/dom.js

@@ -499,8 +499,7 @@ function makePreloader() {
 function makePageIndicator(searchResult) {
     let pageIndicator = document.createElement("div");
     pageIndicator.setAttribute("class", "page-indicator font-weight-light");
-    const totalHits = searchResult["hits"]["total"].hasOwnProperty("value")
-        ? searchResult["hits"]["total"]["value"] : searchResult["hits"]["total"];
+    const totalHits = searchResult["aggregations"]["total_count"]["value"];
     pageIndicator.appendChild(document.createTextNode(docCount + " / " + totalHits));
     return pageIndicator;
 }
@@ -547,8 +546,7 @@ function makeStatsCard(searchResult) {
     });
 
     let stat = document.createElement("span");
-    const totalHits = searchResult["hits"]["total"].hasOwnProperty("value")
-        ? searchResult["hits"]["total"]["value"] : searchResult["hits"]["total"];
+    const totalHits = searchResult["aggregations"]["total_count"]["value"];
     stat.appendChild(document.createTextNode(totalHits + " results in " + searchResult["took"] + "ms"));
 
     statsCardBody.appendChild(stat);

web/js/search.js

@@ -363,7 +363,7 @@ function search(after = null) {
         },
         "sort": [
             {"_score": {"order": "desc"}},
-            {"_tie": {"order":"asc"}}
+            {"_tie": {"order": "asc"}}
         ],
         highlight: {
             pre_tags: ["<mark>"],
@@ -376,11 +376,13 @@ function search(after = null) {
                 font_name: {},
             }
         },
-        aggs: {
-            total_size: {"sum": {"field": "size"}}
-        },
+        aggs:
+            {
+                total_size: {"sum": {"field": "size"}},
+                total_count: {"value_count": {"field": "size"}}
+            },
         size: SIZE,
-    }
+    };
 
     if (after) {
         q.search_after = [after["_score"], after["_id"]];

web/search.html

@@ -11,7 +11,7 @@
 
 <nav class="navbar navbar-expand-lg">
     <a class="navbar-brand" href="/">sist2</a>
-    <span class="badge badge-pill version">v1.2.7</span>
+    <span class="badge badge-pill version">v1.2.8</span>
     <span class="tagline">Lightning-fast file system indexer and search tool </span>
     <a style="margin-left: auto" id="theme" class="btn" title="Toggle theme" href="/">Theme</a>
 </nav>