From b9e31706c33cd5ac10fa66a3a88cb54a5327220c Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Fri, 20 Jun 2025 15:40:04 +0000
Subject: [PATCH] GS-2156
---
lib/search.js | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/lib/search.js b/lib/search.js
index c332548..11e1536 100644
--- a/lib/search.js
+++ b/lib/search.js
@@ -1,11 +1,14 @@
const _ = require("lodash")
const {Index, Document, Worker} = require("flexsearch")
+const settings = require("../settings")
+const fs = require("node:fs")
/////////////////////////////////////////////////////////////////////////
// Message index
const options = {
- tokenize: "full",
+ // tokenize: "full",
+ tokenize: "forward",
split: true,
}
@@ -67,27 +70,44 @@
// .then(console.log)
// .catch(console.error)
-async function run() {
+async function run () {
await doIndex()
console.log(search("latu"))
}
/////////////////////////////////////////////////////////////////////////
+let indexed = false
async function doIndex () {
const start = Date.now()
console.log("++ START indexing Users...")
- let users = require("../users.json")
- // users = users.slice(10)
+ const {readFromFile, file} = settings.search
+ clearIndex(idxUser)
+
+ let users
+ if (readFromFile) {
+ users = fs.readFileSync(file, "utf8")
+ users = JSON.parse(users)
+ }
+ else {
+ console.log("~~~ reading users from DB ... ~~~")
+ const db = require("./db")
+ const {data} = await db.getUsers(0, 100000)
+ console.log(`loaded ${data.length} users from DB...`)
+ users = data
+ }
for (const user of users) {
addUser(user)
// addTags(user)
}
+ indexed = true
console.log(`++ 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)
}
@@ -109,8 +129,11 @@
/////// idxMessage FNS ////////////////////////////////////////////////////////////////
function getUserString (user) {
- const {usr_id, firstname, lastname} = user
- return `${usr_id} ${firstname} ${lastname}`.trim()
+ const {usr_id, firstname, lastname, login, institution, department} = user
+ // if(firstname.trim()==="Adolfo") console.log(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()
}
function addUser (user) {
@@ -125,6 +148,10 @@
remove(idxUser, usr_id)
}
+function clearIndex(index) {
+ index.clear()
+}
+
/////// idxTags FNS ////////////////////////////////////////////////////////////////
--
Gitblit v1.8.0