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

Specificly search for field id vs name

Browse Source
This commit is contained in:
Eike Kettner
2021-03-02 21:09:31 +01:00
parent b4b5acde13
commit a48504debb
7 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala
View File

@ -145,7 +145,10 @@ object ItemQueryGenerator {
}
case Expr.CustomFieldMatch(field, op, value) =>
tables.item.id.in(itemsWithCustomField(coll, field, makeOp(op), value))
tables.item.id.in(itemsWithCustomField(_.name ==== field)(coll, makeOp(op), value))
case Expr.CustomFieldIdMatch(field, op, value) =>
tables.item.id.in(itemsWithCustomField(_.id ==== field)(coll, makeOp(op), value))
case Expr.Fulltext(_) =>
// not supported here
@ -229,18 +232,21 @@ object ItemQueryGenerator {
QOp.Lte
}
def itemsWithCustomField(coll: Ident, field: String, op: QOp, value: String): Select = {
private def itemsWithCustomField(
sel: RCustomField.Table => Condition
)(coll: Ident, op: QOp, value: String): Select = {
val cf = RCustomField.as("cf")
val cfv = RCustomFieldValue.as("cfv")
val v = if (op == QOp.LowerLike) QueryWildcard.lower(value) else value
Select(
select(cfv.itemId),
from(cfv).innerJoin(cf, cf.id === cfv.field),
cf.cid === coll && (cf.name ==== field || cf.id ==== field) && Condition.CompareVal(
cf.cid === coll && sel(cf) && Condition.CompareVal(
cfv.value,
op,
v
)
)
}
}

7
modules/store/src/main/scala/docspell/store/queries/QueryWildcard.scala
View File

@ -19,4 +19,11 @@ object QueryWildcard {
else res
}
def atEnd(s: String): String =
if (s.endsWith("*")) s"${s.dropRight(1)}%"
else s
def addAtEnd(s: String): String =
if (s.endsWith("*")) atEnd(s)
else s"${s}%"
}