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

expose indexRoot value to documents

Browse Source
This commit is contained in:
simon987 2023-10-08 21:00:03 -04:00
parent 8299237ea0
commit b8c905bd64
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sist2-vue/src/Sist2Api.js
View File

@ -33,18 +33,6 @@ class Sist2Api {
getSist2Info() { getSist2Info() {
return axios.get(`${this.baseUrl}i`).then(resp => { return axios.get(`${this.baseUrl}i`).then(resp => {
const indices = resp.data.indices;
resp.data.indices = indices.map(idx => {
return {
id: idx.id,
name: idx.name,
timestamp: idx.timestamp,
version: idx.version,
models: idx.models,
};
});
this.sist2Info = resp.data; this.sist2Info = resp.data;
return resp.data; return resp.data;
@ -155,6 +143,12 @@ class Sist2Api {
} }
} }
_getIndexRoot(indexId) {
console.log(indexId)
console.log(this.sist2Info.indices.find(idx => idx.id === indexId))
return this.sist2Info.indices.find(idx => idx.id === indexId).root;
}
esQuery(query) { esQuery(query) {
return axios.post(`${this.baseUrl}es`, query).then(resp => { return axios.post(`${this.baseUrl}es`, query).then(resp => {
const res = resp.data; const res = resp.data;
@ -163,6 +157,7 @@ class Sist2Api {
res.hits.hits.forEach((hit) => { res.hits.hits.forEach((hit) => {
hit["_source"]["name"] = strUnescape(hit["_source"]["name"]); hit["_source"]["name"] = strUnescape(hit["_source"]["name"]);
hit["_source"]["path"] = strUnescape(hit["_source"]["path"]); hit["_source"]["path"] = strUnescape(hit["_source"]["path"]);
hit["_source"]["indexRoot"] = this._getIndexRoot(hit["_source"]["index"]);
this.setHitProps(hit); this.setHitProps(hit);
this.setHitTags(hit); this.setHitTags(hit);

4
src/sist.h
View File

@ -51,11 +51,11 @@
#include <ctype.h> #include <ctype.h>
#include "git_hash.h" #include "git_hash.h"
#define VERSION "3.3.4" #define VERSION "3.3.5"
static const char *const Version = VERSION; static const char *const Version = VERSION;
static const int VersionMajor = 3; static const int VersionMajor = 3;
static const int VersionMinor = 3; static const int VersionMinor = 3;
static const int VersionPatch = 4; static const int VersionPatch = 5;
#ifndef SIST_PLATFORM #ifndef SIST_PLATFORM
#define SIST_PLATFORM unknown #define SIST_PLATFORM unknown

10
src/web/serve.c
View File

@ -88,7 +88,7 @@ void stats_files(struct mg_connection *nc, struct mg_http_message *hm) {
memcpy(index_id_str, hm->uri.ptr + 3, 8); memcpy(index_id_str, hm->uri.ptr + 3, 8);
*(index_id_str + 8) = '\0'; *(index_id_str + 8) = '\0';
int index_id = (int)strtol(index_id_str, NULL, 16); int index_id = (int) strtol(index_id_str, NULL, 16);
memcpy(arg_stat_type, hm->uri.ptr + 3 + 9, 4); memcpy(arg_stat_type, hm->uri.ptr + 3 + 9, 4);
*(arg_stat_type + sizeof(arg_stat_type) - 1) = '\0'; *(arg_stat_type + sizeof(arg_stat_type) - 1) = '\0';
@ -368,6 +368,10 @@ void index_info(struct mg_connection *nc) {
cJSON_AddNumberToObject(idx_json, "timestamp", (double) idx->desc.timestamp); cJSON_AddNumberToObject(idx_json, "timestamp", (double) idx->desc.timestamp);
cJSON_AddItemToArray(arr, idx_json); cJSON_AddItemToArray(arr, idx_json);
#ifdef SIST_DEBUG_INFO
cJSON_AddStringToObject(idx_json, "root", idx->desc.root);
#endif
cJSON *models = database_get_models(idx->db); cJSON *models = database_get_models(idx->db);
cJSON_AddItemToObject(idx_json, "models", models); cJSON_AddItemToObject(idx_json, "models", models);
} }
@ -480,7 +484,7 @@ tag_req_t *parse_tag_request(cJSON *json) {
return req; return req;
} }
subreq_ctx_t *elastic_delete_tag(const char* sid, const tag_req_t *req) { subreq_ctx_t *elastic_delete_tag(const char *sid, const tag_req_t *req) {
char *buf = malloc(sizeof(char) * 8192); char *buf = malloc(sizeof(char) * 8192);
snprintf(buf, 8192, snprintf(buf, 8192,
"{" "{"
@ -500,7 +504,7 @@ subreq_ctx_t *elastic_delete_tag(const char* sid, const tag_req_t *req) {
return web_post_async(url, buf, WebCtx.es_insecure_ssl); return web_post_async(url, buf, WebCtx.es_insecure_ssl);
} }
subreq_ctx_t *elastic_write_tag(const char* sid, const tag_req_t *req) { subreq_ctx_t *elastic_write_tag(const char *sid, const tag_req_t *req) {
char *buf = malloc(sizeof(char) * 8192); char *buf = malloc(sizeof(char) * 8192);
snprintf(buf, 8192, snprintf(buf, 8192,
"{" "{"