TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 02:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1024 from eikek/enhance-search-mode

Browse Source 
Enhance search mode to search in all items
This commit is contained in:
mergify[bot]
2021-08-21 13:56:43 +00:00
committed by GitHub
parent 2cec8822c7 d5022f883e
commit 45f6357f49
7 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/backend/src/main/scala/docspell/backend/ops/OSimpleSearch.scala
View File

@ -220,6 +220,7 @@ object OSimpleSearch {
settings.searchMode match {
case SearchMode.Trashed => q.withFix(_.andQuery(ItemQuery.Expr.Trashed))
case SearchMode.Normal => q.withFix(_.andQuery(ItemQuery.Expr.ValidItemStates))
case SearchMode.All => q.withFix(_.andQuery(ItemQuery.Expr.ValidItemsOrTrashed))
}
fulltextQuery match {
case Some(ftq) if settings.useFTS =>
@ -282,6 +283,7 @@ object OSimpleSearch {
settings.searchMode match {
case SearchMode.Trashed => q.withFix(_.andQuery(ItemQuery.Expr.Trashed))
case SearchMode.Normal => q.withFix(_.andQuery(ItemQuery.Expr.ValidItemStates))
case SearchMode.All => q.withFix(_.andQuery(ItemQuery.Expr.ValidItemsOrTrashed))
}
fulltextQuery match {
case Some(ftq) if settings.useFTS =>