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

Return attachment-name from index

Browse Source
This commit is contained in:
Eike Kettner 2020-06-22 21:28:26 +02:00
parent 8ffbf651b0
commit a58ffd11e1
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/fts-client/src/main/scala/docspell/ftsclient/FtsResult.scala
View File

@ -18,8 +18,8 @@ object FtsResult {
FtsResult(Duration.millis(0), 0, 0.0, Map.empty, Nil) FtsResult(Duration.millis(0), 0, 0.0, Map.empty, Nil)
sealed trait MatchData sealed trait MatchData
case class AttachmentData(attachId: Ident) extends MatchData case class AttachmentData(attachId: Ident, attachName: String) extends MatchData
case object ItemData extends MatchData case object ItemData extends MatchData
case class ItemMatch( case class ItemMatch(
id: Ident, id: Ident,

5
modules/fts-solr/src/main/scala/docspell/ftssolr/JsonCodec.scala
View File

@ -80,7 +80,10 @@ trait JsonCodec {
disc <- c.get[String]("discriminator") disc <- c.get[String]("discriminator")
md <- md <-
if ("attachment" == disc) if ("attachment" == disc)
c.get[Ident]("attachmentId").map(FtsResult.AttachmentData.apply) for {
aId <- c.get[Ident](Field.attachmentId.name)
aName <- c.get[String](Field.attachmentName.name)
} yield FtsResult.AttachmentData(aId, aName)
else Right(FtsResult.ItemData) else Right(FtsResult.ItemData)
} yield md } yield md
} }

1
modules/fts-solr/src/main/scala/docspell/ftssolr/SolrQuery.scala
View File

@ -32,6 +32,7 @@ trait SolrQuery[F[_]] {
Field.collectiveId, Field.collectiveId,
Field("score"), Field("score"),
Field.attachmentId, Field.attachmentId,
Field.attachmentName,
Field.discriminator Field.discriminator
), ),
q q