simon987/sist2
1
0
Fork 0
mirror of https://github.com/simon987/sist2.git synced 2025-04-16 08:56:45 +00:00
Code Issues Projects Releases Wiki Activity

Fix total count for ES 7.5

Browse Source
This commit is contained in:
simon 2020-02-08 09:21:38 -05:00
parent e9b6e1cdc2
commit 402b103c49
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.c
View File

@ -6,7 +6,7 @@
#define EPILOG "Made by simon987 <me@simon987.net>. Released under GPL-3.0"
static const char *const Version = "1.2.7";
static const char *const Version = "1.2.8";
static const char *const usage[] = {
"sist2 scan [OPTION]... PATH",
"sist2 index [OPTION]... INDEX",

4
src/web/static_generated.c
View File

File diff suppressed because one or more lines are too long

6
web/js/dom.js
View File

@ -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);

12
web/js/search.js
View File

@ -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"]];

2
web/search.html
View File

@ -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>