simon987/sist2
1
0
Fork 0
mirror of https://github.com/simon987/sist2.git synced 2025-04-17 17:26:48 +00:00
Code Issues Projects Releases Wiki Activity

Fix for ES 7.7 #54

Browse Source
This commit is contained in:
simon987 2020-06-01 18:14:06 -04:00
parent 5e7fdaf8dd
commit 13fdbd9e69
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.c
View File

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

14
src/static/js/search.js
View File

@ -332,24 +332,24 @@ function search(after = null) {
let path = pathBar.value.replace(/\/$/, "").toLowerCase(); //remove trailing slashes let path = pathBar.value.replace(/\/$/, "").toLowerCase(); //remove trailing slashes
if (path !== "") { if (path !== "") {
filters.push([{term: {path: path}}]) filters.push({term: {path: path}})
} }
let mimeTypes = getSelectedNodes(mimeTree); let mimeTypes = getSelectedNodes(mimeTree);
if (!mimeTypes.includes("any")) { if (!mimeTypes.includes("any")) {
filters.push([{terms: {"mime": mimeTypes}}]); filters.push({terms: {"mime": mimeTypes}});
} }
let tags = getSelectedNodes(tagTree); let tags = getSelectedNodes(tagTree);
if (!tags.includes("any")) { if (!tags.includes("any")) {
filters.push([{terms: {"tag": tags}}]); filters.push({terms: {"tag": tags}});
} }
if (date_min && date_max) { if (date_min && date_max) {
filters.push([{range: {mtime: {gte: date_min, lte: date_max}}}]) filters.push({range: {mtime: {gte: date_min, lte: date_max}}})
} else if (date_min) { } else if (date_min) {
filters.push([{range: {mtime: {gte: date_min}}}]) filters.push({range: {mtime: {gte: date_min}}})
} else if (date_max) { } else if (date_max) {
filters.push([{range: {mtime: {lte: date_max}}}]) filters.push({range: {mtime: {lte: date_max}}})
} }
let q = { let q = {
@ -399,6 +399,8 @@ function search(after = null) {
} }
} }
console.log(q)
$.jsonPost("es", q).then(searchResult => { $.jsonPost("es", q).then(searchResult => {
let hits = searchResult["hits"]["hits"]; let hits = searchResult["hits"]["hits"];
if (hits) { if (hits) {

2
src/static/search.html
View File

@ -11,7 +11,7 @@
<nav class="navbar navbar-expand-lg"> <nav class="navbar navbar-expand-lg">
<a class="navbar-brand" href="/">sist2</a> <a class="navbar-brand" href="/">sist2</a>
<span class="badge badge-pill version">2.3.2</span> <span class="badge badge-pill version">2.3.3</span>
<span class="tagline">Lightning-fast file system indexer and search tool </span> <span class="tagline">Lightning-fast file system indexer and search tool </span>
<a class="btn ml-auto" href="/stats">Stats</a> <a class="btn ml-auto" href="/stats">Stats</a>
<button class="btn" type="button" data-toggle="modal" data-target="#settings" onclick="loadSettings()">Settings</button> <button class="btn" type="button" data-toggle="modal" data-target="#settings" onclick="loadSettings()">Settings</button>

4
src/web/static_generated.c
View File

File diff suppressed because one or more lines are too long