From eb0047903ade26b0b123fc2176c3adaac0fcbb0e Mon Sep 17 00:00:00 2001
From: white <122345776@umail.ucc.ie>
Date: Fri, 7 Mar 2025 09:12:10 +0000
Subject: [PATCH] UPDATE: fixed search bar algorithm (again)

---
 web_server/blueprints/search_bar.py |   2 +-
 web_server/database/app.db          | Bin 167936 -> 167936 bytes
 web_server/database/text_search.sql | 114 ----------------------------
 3 files changed, 1 insertion(+), 115 deletions(-)
 delete mode 100644 web_server/database/text_search.sql

diff --git a/web_server/blueprints/search_bar.py b/web_server/blueprints/search_bar.py
index b4f3631..b1a22df 100644
--- a/web_server/blueprints/search_bar.py
+++ b/web_server/blueprints/search_bar.py
@@ -67,7 +67,7 @@ def search_results():
     res_dict = []
     streams = db.fetchall("""SELECT s.user_id, s.title, s.num_viewers, c.category_name, u.username
                     FROM streams AS s
-                    INNER JOIN stream_fts AS f ON s.user_id = f.user_id
+                    INNER JOIN streams AS f ON s.user_id = f.user_id
                     INNER JOIN users AS u ON s.user_id = u.user_id
                     INNER JOIN categories AS c ON s.category_id = c.category_id
                     """)
diff --git a/web_server/database/app.db b/web_server/database/app.db
index fd8bac610822ec2ef7d0124262cacf86897e5bd4..9f6837cdf297431157f010f902b64e20809bbd41 100644
GIT binary patch
delta 794
zcmZ{hT}V_x6vyYx{oLJg@4cmI?Uru2TcL%uE>r|cR0csGK8cC8T4o}+X=*HGn?V<R
z5X0KR9zvwILJ-O6LFiGiAonGxr0l^23%78C5TediqAz6lUH&t3_|2KQi6M7l$ldR=
znh7C0kz8aQA<Fda;xI1mE<UB;3K+}yCE24f+i<D&A*aZW^q5H#WIv;m#28^so?3T<
zKBM<(897NO)n2vQyH6CDP^7LWmX_=D!L8usXno81_FZ<VD)v~A1d(ikW=YigAORF=
z#H=5xK<;U?BVz$q8w`vXM@1$dvdo~iKy<Z?c#p9ucE_{d{ly)3A6Co$9wJl%4-}aY
zInL34Nu=88Ly*0_v|1!OXw-@1E1&D6H=GpX&0Vxb3)=_P+=>8CMIcW!9DwaI8lZC^
z;Hr^2?34V}1?ZyWKCf(od*kH*rr|t>Nr*A;dBeP(^q5uf%)?tJAX}u*K%RWW!hPp8
zHz0Y457~rlMEuBRqyWiBwjeu@t;jYcganbofz#$|5sJcFufB5Fva$5oqVon{dI6S%
zOF~P)vY}$_%A_B@<HTtzgLMlA&-{RF-T1&-*>iRid#qyud%P>HshdW_s(AJvmq1t6
z?|aX&KK70cqqCc>-h0?j>(>^S&|l(mOn){hGIcb|EOLD$E-6LyPx=Y%rPipvSI;Sn
z%2g@#{}9D7`qYJgNX_Bti!g;rsSts^a2zm7-*_wxaVN$3Vi+2oWb&#~IE#rs;uEFt
g1QUGbS0Yf!2TOqQ@oO}P+ud{!H^{6gyiRA#pR%vWegFUf

delta 1169
zcmZ{jTSyd97{||d_ROBynX`Ll)7-7yYNga9ujxWX7qz4!v713qB-^^0QLg9~+D*5h
zfga4LcIeF_C<u&@Is`$Fg7wh-Md?Cxp+XDyB_Zl;CV0si&YbW3XXf|)zcb%-_Gq0w
zTDQ*~LI~x`;gJI)r1W3NE0JPB-Zmwr@T9z=rFWW5?npN)WIV@Qe%eSFK>QBek9aRT
zpzqVd>X6z+lO%!r$4?P3V3{4mE%7o8H-N-5%)$#jmN@T)tpwv|qB8;^APB)>>q9-n
zWrRLk2OHo}Dr&Qa*FsG6E`ps#mRuXk08+-30oOU#CN{t>=_|D#+A(c|<Ar0N`dr;j
zheUP}TvtfGS!x%>Zb(4Y5wn7NN=hK^j)nFgiiAV4NJF%xy|zBqS{sfw)i*Z$NAj)T
zQCVJ78K^0*sHzO)Ogv!~t$@7hcC(y%f<cJSok^^VhFcqtP0jL8n?DQl(Q+uLZZpfq
znQ1eb(q$~t6q_(H;XI|yn}ykJK<<`6xHvaX&2`k1pAYf!nc&8{wkc4#_Ra=e2^%)G
znro@2u<-wdhhm{AusSJZ%tE`_00sQ8xrTbOvefvZzs{_urH}^gR<so6c_)*!T{|~d
zZw$!q6%1InJFuUYn5*rcjhR*`1H2-<3UUZJ-C_p&G94|DXa*uk8T{g$k07ECBK}Dq
zWG;QA&mDNAThRxQE=Kl%mlT8Ss8q|RIxW>*sgeC}UZ}li2^mj1VDZK6#<0i^!E2X_
z`6%LJeDtmxf8yzO0t_%#h(k_J`LFn$R|V~aF>dESk)H<z?Us)0AaC)ceCG@I>oy-8
zjkL5jMw^H;WtBw{|Hz{3F*_rz)-oZjUbaomWQ}%!+qS@^3Hn3=Z40<p(6`gjBKaGf
z#^3T;7vdjS7kk65N#-dwUj8*d-aidIy@c<`=X@_{5td1O+$m_8j3)aR$y)3*mdX7|
zvpq#T;4+*w>^nQlRQ<A^rQLUYRllj#^cAhQzq8jV!^#Pf*Nh)J#MWXsPOK|Mz^r>G
U@m$M1g|CqKUUR)z(t(GJKkx=y%m4rY

diff --git a/web_server/database/text_search.sql b/web_server/database/text_search.sql
deleted file mode 100644
index 98f1b31..0000000
--- a/web_server/database/text_search.sql
+++ /dev/null
@@ -1,114 +0,0 @@
-/* Full text search queries for categories */
-DROP TABLE IF EXISTS category_fts;
-CREATE VIRTUAL TABLE category_fts
-USING fts5 (category_id, category_name);
-
-INSERT INTO category_fts (category_id, category_name)
-SELECT category_id, category_name
-FROM categories;
-
--- Triggers that inserts new titles into category_fts
-DROP TRIGGER IF EXISTS insert_category_fts;
-CREATE TRIGGER insert_category_fts
-AFTER INSERT ON categories
-BEGIN
-    INSERT INTO category_fts(category_id, category_name)
-    VALUES (NEW.category_id, NEW.category_name);
-END;
-
-DROP TRIGGER IF EXISTS update_category_fts;
-CREATE TRIGGER update_category_fts
-AFTER UPDATE ON categories
-BEGIN
-    UPDATE category_fts
-    SET
-        category_id = NEW.category_id,
-        category_name = NEW.category_name
-    WHERE category_id = NEW.category_id;
-END;
-
-DROP TRIGGER IF EXISTS delete_category_fts;
-CREATE TRIGGER delete_category_fts
-AFTER DELETE ON categories
-BEGIN
-    DELETE FROM category_fts
-    WHERE category_id = OLD.category_id;
-END;
-
-/* Full text search queries for users */
-DROP TABLE IF EXISTS user_fts;
-CREATE VIRTUAL TABLE user_fts
-USING fts5 (user_id, username, is_live);
-
-INSERT INTO user_fts (user_id, username, is_live)
-SELECT user_id, username, is_live
-FROM users;
-
--- Triggers that inserts new titles into user_fts
-DROP TRIGGER IF EXISTS insert_user_fts;
-CREATE TRIGGER insert_user_fts
-AFTER INSERT ON users
-BEGIN
-    INSERT INTO user_fts(user_id, username, is_live)
-    VALUES (NEW.user_id, NEW.username, NEW.is_live);
-END;
-
-DROP TRIGGER IF EXISTS update_user_fts;
-CREATE TRIGGER update_user_fts
-AFTER UPDATE ON users
-BEGIN
-    UPDATE user_fts
-    SET
-        user_id = NEW.user_id,
-        username = NEW.username,
-        is_live = NEW.is_live
-    WHERE user_id = NEW.user_id;
-END;
-
-DROP TRIGGER IF EXISTS delete_user_fts;
-CREATE TRIGGER delete_user_fts
-AFTER DELETE ON users
-BEGIN
-    DELETE FROM user_fts
-    WHERE user_id = OLD.user_id;
-END;
-
-
-/* Full text search queries for users */
-DROP TABLE IF EXISTS stream_fts;
-CREATE VIRTUAL TABLE stream_fts
-USING fts5 (user_id, title, num_viewers, category_id);
-
-INSERT INTO stream_fts (user_id, title, num_viewers, category_id)
-SELECT user_id, title, num_viewers, category_id
-FROM streams;
-
--- Triggers that inserts new titles into stream_fts
-DROP TRIGGER IF EXISTS insert_stream_fts;
-CREATE TRIGGER insert_stream_fts
-AFTER INSERT ON streams
-BEGIN
-    INSERT INTO stream_fts(user_id, title, num_viewers, category_id)
-    VALUES (NEW.user_id, NEW.title, NEW.num_viewers, NEW.category_id);
-END;
-
-DROP TRIGGER IF EXISTS update_stream_fts;
-CREATE TRIGGER update_stream_fts
-AFTER UPDATE ON streams
-BEGIN
-    UPDATE stream_fts
-    SET
-        user_id = NEW.user_id,
-        title = NEW.title,
-        num_viewers = NEW.num_viewers,
-        category_id = NEW.category_id
-    WHERE user_id = NEW.user_id;
-END;
-
-DROP TRIGGER IF EXISTS delete_stream_fts;
-CREATE TRIGGER delete_stream_fts
-AFTER DELETE ON streams
-BEGIN
-    DELETE FROM stream_fts
-    WHERE user_id = OLD.user_id;
-END;
\ No newline at end of file