From 3379f7492142d20346446790dd4a491a29da44ce Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Sat, 12 Jul 2025 15:45:09 +0000
Subject: [PATCH] adding better logging

---
 lib/search.js |   38 +++++++++++++++++++++++++++-----------
 1 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/lib/search.js b/lib/search.js
index 8053536..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,21 +69,22 @@
 }
 
 // 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)
 
    let users
    if (readFromFile) {
@@ -89,24 +92,31 @@
       users = JSON.parse(users)
    }
    else {
-      // TODO zweite möglichkeit "readFromApi" implementieren
+      log.info("~~~ reading users from DB ... ~~~")
+      const db = require("./db")
+      const {data} = await db.getUsers(0, 100000)
+      log.info(`loaded ${data.length} users from DB...`)
+      users = data
    }
 
    for (const user of users) {
       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})
 }
 
@@ -121,8 +131,10 @@
 /////// idxMessage FNS ////////////////////////////////////////////////////////////////
 
 function getUserString (user) {
-   const {usr_id, firstname, lastname, institution, department} = user
-   return `${usr_id} ${firstname} ${lastname} ${institution} ${department}`.trim()
+   const {usr_id, firstname, lastname, login, institution, department} = user
+   // 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()
 }
 
@@ -138,6 +150,10 @@
    remove(idxUser, usr_id)
 }
 
+function clearIndex(index) {
+   index.clear()
+}
+
 
 /////// idxTags FNS ////////////////////////////////////////////////////////////////
 

--
Gitblit v1.8.0