From 9c51cd91ccf824342963491faeb435aa1ddeb22f Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Fri, 06 Jun 2025 15:32:58 +0000
Subject: [PATCH] adding search
---
lib/db.js | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/lib/db.js b/lib/db.js
index bc2ac32..19519c1 100644
--- a/lib/db.js
+++ b/lib/db.js
@@ -33,6 +33,7 @@
getKurse,
getKurs,
getKursItems,
+ getKursItems2,
// getKursByObjId,
// getKursByRefId,
getKursTeilnehmer,
@@ -78,7 +79,6 @@
async function getUserByLogin (login) {
const sel = `usr_id, login, firstname, lastname, gender, email, institution, street, city, zipcode, country, department, active`
- // TODO user defined fields
// TODO check args for SQL Injection
const pool = await poolP
@@ -87,13 +87,11 @@
FROM ${database}.usr_data AS ud
WHERE login = '${login}'`
)
- console.log(results)
return joinUDF(results[0])
}
async function getUserByUserId (userId) {
const sel = `usr_id, login, firstname, lastname, gender, email, institution, street, city, zipcode, country, department, active`
- // TODO user defined fields
// TODO check args for SQL Injection
const pool = await poolP
@@ -187,7 +185,7 @@
async function getKurs (ref_id) {
const pool = await poolP
- const q = `SELECT or2.ref_id, or2.obj_id, od.title, od.description, od.type
+ const q = `SELECT or2.ref_id, or2.obj_id, od.title, od.description, od.type, od.create_date
FROM ${database}.object_reference or2
INNER JOIN ${database}.object_data od ON od.obj_id = or2.obj_id
WHERE or2.ref_id = '${ref_id}'
@@ -216,6 +214,33 @@
return results
}
+async function getKursItems2 (ref_id) {
+ const pool = await poolP
+ const q = `
+WITH RECURSIVE tree (parent_id, obj_id, ref_id, title, type ) AS (
+ SELECT ci.parent_id, or2.obj_id , ci.obj_id as ref_id, od.title, od.type
+ FROM ${database}.crs_items ci
+ INNER JOIN ${database}.object_reference or2 ON or2.ref_id = ci.obj_id
+ INNER JOIN ${database}.object_data od ON od.obj_id = or2.obj_id
+ WHERE ci.obj_id = ${ref_id} -- Kurs ref_id
+ AND or2.deleted is NULL
+
+ UNION ALL
+
+ SELECT child.parent_id, or2.obj_id , child.obj_id as ref_id, od.title, od.type
+ FROM ${database}.crs_items child
+ INNER JOIN ${database}.object_reference or2 ON or2.ref_id = child.obj_id
+ INNER JOIN ${database}.object_data od ON od.obj_id = or2.obj_id
+ JOIN tree ON child.parent_id = tree.ref_id
+ WHERE or2.deleted is NULL
+)
+SELECT * FROM tree
+ORDER BY tree.ref_id
+`
+ const [results] = await pool.query(q)
+ return results
+}
+
async function getKursTeilnehmer (ref_id) {
const pool = await poolP
const q = `SELECT ci.parent_id,
--
Gitblit v1.8.0