From 9297f199f384b8f257a80c6254d335724705d995 Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Thu, 23 Oct 2025 15:38:26 +0000
Subject: [PATCH] GS-2375
---
lib/search.js | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/lib/search.js b/lib/search.js
index 66b3521..a6458b0 100644
--- a/lib/search.js
+++ b/lib/search.js
@@ -1,7 +1,9 @@
+const fs = require("node:fs")
const _ = require("lodash")
const {Index, Document, Worker} = require("flexsearch")
+
const settings = require("../settings")
-const fs = require("node:fs")
+const log = require("../logger")
/////////////////////////////////////////////////////////////////////////
@@ -67,19 +69,20 @@
}
// run()
-// .then(console.log)
+// .then(log.info)
// .catch(console.error)
async function run () {
await doIndex()
- console.log(search("latu"))
+ log.info(search("latu"))
}
/////////////////////////////////////////////////////////////////////////
+let indexed = false
async function doIndex () {
const start = Date.now()
- console.log("++ START indexing Users...")
+ log.info("++ START indexing Users...")
const {readFromFile, file} = settings.search
clearIndex(idxUser)
@@ -89,10 +92,10 @@
users = JSON.parse(users)
}
else {
- console.log("~~~ reading users from DB ... ~~~")
+ log.info("~~~ reading users from DB ... ~~~")
const db = require("./db")
const {data} = await db.getUsers(0, 100000)
- console.log(`loaded ${data.length} users from DB...`)
+ log.info(`loaded ${data.length} users from DB...`)
users = data
}
@@ -100,17 +103,20 @@
addUser(user)
// addTags(user)
}
- console.log(`++ END indexing Users in ${Date.now() - start}ms`)
+ indexed = true
+ log.info(`++ END indexing Users in ${Date.now() - start}ms`)
}
-function search (query) {
+async function search (query) {
+ // when called from a cli program the search index is not initalized
+ if(!indexed) await doIndex()
const searchLimit = 10000
return idxUser.search(query, searchLimit)
}
function searchUsers (query, user) {
// query = query.split(" ").join(" OR ") // ohne das "OR" scheint immer nur "AND" zu sein | die search option {bool:"or"} wird ignoriert
- // console.log(`searching messages for "${query}"`)
+ // log.info(`searching messages for "${query}"`)
return idxUser.search(`${user} ${query}`, {suggest: true})
}
@@ -126,8 +132,9 @@
function getUserString (user) {
const {usr_id, firstname, lastname, login, institution, department} = user
- if(firstname.trim()==="Adolfo") console.log(user)
- return `${usr_id} ${login} ${firstname} ${lastname} ${institution} ${department}`.trim()
+ // if(firstname.trim()==="Adolfo") log.info(user)
+ return `${login} ${firstname} ${lastname} ${institution} ${department}`.trim()
+ // return `${usr_id} ${login} ${firstname} ${lastname} ${institution} ${department}`.trim() // KEINE usr_id
// return `${usr_id} ${firstname} ${lastname}`.trim()
}
--
Gitblit v1.8.0