From 868ae25e6d659fe6d507af7688b809f4c6c0c720 Mon Sep 17 00:00:00 2001 From: Damien De Paoli Date: Sun, 23 Jan 2022 14:41:32 +1100 Subject: [PATCH] quick fix for BUG-81 / need to test with PROD dataset --- files.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files.py b/files.py index 6fbf913..a12a757 100644 --- a/files.py +++ b/files.py @@ -243,7 +243,7 @@ def GetEntries( OPT ): search_term=OPT.orig_search_term if 'AI:' in search_term: search_term = search_term.replace('AI:','') - all_entries = Entry.query.join(File).join(FaceFileLink).join(Face).join(FaceRefimgLink).join(Refimg).join(PersonRefimgLink).join(Person).filter(Person.tag.ilike(f"%{search_term}%")).order_by(File.year.desc(),File.month.desc(),File.day.desc(),Entry.name).offset(OPT.offset).limit(OPT.how_many).all() + all_entries = Entry.query.join(File).distinct().join(FaceFileLink).join(Face).join(FaceRefimgLink).join(Refimg).join(PersonRefimgLink).join(Person).filter(Person.tag.ilike(f"%{search_term}%")).order_by(File.year.desc(),File.month.desc(),File.day.desc(),Entry.name).offset(OPT.offset).limit(OPT.how_many).all() else: file_data=Entry.query.join(File).filter(Entry.name.ilike(f"%{search_term}%")).order_by(File.year.desc(),File.month.desc(),File.day.desc(),Entry.name).offset(OPT.offset).limit(OPT.how_many).all() dir_data=Entry.query.join(File).join(EntryDirLink).join(Dir).filter(Dir.rel_path.ilike(f"%{search_term}%")).order_by(File.year.desc(),File.month.desc(),File.day.desc(),Entry.name).offset(OPT.offset).limit(OPT.how_many).all()