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

Don't return items still in processing

Browse Source
This commit is contained in:
Eike Kettner
2021-03-27 22:04:12 +01:00
parent cc38b850a6
commit 03459124ca
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala
View File

@ -15,6 +15,7 @@ import docspell.common._
import docspell.common.syntax.all._ import docspell.common.syntax.all._
import docspell.query.FulltextExtract.Result.TooMany import docspell.query.FulltextExtract.Result.TooMany
import docspell.query.FulltextExtract.Result.UnsupportedPosition import docspell.query.FulltextExtract.Result.UnsupportedPosition
import docspell.query.ItemQuery.Expr
import docspell.restapi.model._ import docspell.restapi.model._
import docspell.restserver.Config import docspell.restserver.Config
import docspell.restserver.conv.Conversions import docspell.restserver.conv.Conversions
@ -61,12 +62,12 @@ object ItemRoutes {
detailFlag.getOrElse(false), detailFlag.getOrElse(false),
cfg.maxNoteLength cfg.maxNoteLength
) )
val fixQuery = Query.Fix(user.account, None, None) val fixQuery = Query.Fix(user.account, Some(Expr.ValidItemStates), None)
searchItems(backend, dsl)(settings, fixQuery, itemQuery) searchItems(backend, dsl)(settings, fixQuery, itemQuery)
case GET -> Root / "searchStats" :? QP.Query(q) => case GET -> Root / "searchStats" :? QP.Query(q) =>
val itemQuery = ItemQueryString(q) val itemQuery = ItemQueryString(q)
val fixQuery = Query.Fix(user.account, None, None) val fixQuery = Query.Fix(user.account, Some(Expr.ValidItemStates), None)
searchItemStats(backend, dsl)(cfg.fullTextSearch.enabled, fixQuery, itemQuery) searchItemStats(backend, dsl)(cfg.fullTextSearch.enabled, fixQuery, itemQuery)
case req @ POST -> Root / "search" => case req @ POST -> Root / "search" =>
@ -85,7 +86,7 @@ object ItemRoutes {
userQuery.withDetails.getOrElse(false), userQuery.withDetails.getOrElse(false),
cfg.maxNoteLength cfg.maxNoteLength
) )
fixQuery = Query.Fix(user.account, None, None) fixQuery = Query.Fix(user.account, Some(Expr.ValidItemStates), None)
resp <- searchItems(backend, dsl)(settings, fixQuery, itemQuery) resp <- searchItems(backend, dsl)(settings, fixQuery, itemQuery)
} yield resp } yield resp
@ -93,7 +94,7 @@ object ItemRoutes {
for { for {
userQuery <- req.as[ItemQuery] userQuery <- req.as[ItemQuery]
itemQuery = ItemQueryString(userQuery.query) itemQuery = ItemQueryString(userQuery.query)
fixQuery = Query.Fix(user.account, None, None) fixQuery = Query.Fix(user.account, Some(Expr.ValidItemStates), None)
resp <- searchItemStats(backend, dsl)( resp <- searchItemStats(backend, dsl)(
cfg.fullTextSearch.enabled, cfg.fullTextSearch.enabled,
fixQuery, fixQuery,