From ca1b5ec355419b9731df7c79834d8fb264fbba14 Mon Sep 17 00:00:00 2001 From: "Alreeni, Mohammad" <56889860+m-alreeni@users.noreply.github.com> Date: Wed, 11 Sep 2024 15:42:57 +0200 Subject: [PATCH] Fix context for StreamDataActor (#30) Co-authored-by: moh38208 --- .../github/linkedfactory/service/comet/StreamDataActor.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/comet/StreamDataActor.scala b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/comet/StreamDataActor.scala index 0907c3ab..651e848c 100644 --- a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/comet/StreamDataActor.scala +++ b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/comet/StreamDataActor.scala @@ -115,7 +115,7 @@ class StreamDataActor extends CometActor with KvinListener { } override def localSetup { - context = Globals.contextModel.vend.map(_.getURI).openOr(Kvin.DEFAULT_CONTEXT) + context = Data.currentModel.map(_.getURI).openOr(Kvin.DEFAULT_CONTEXT) limit = attributes.get("limit").map(_.toInt).getOrElse(DEFAULT_LIMIT) itemsOrPatterns = attributes.get("items").map(_.split("\\s+").filter(_.nonEmpty).map(URIs.createURI(_, true))) .filter(_.nonEmpty).map(_.toSet).getOrElse { @@ -177,7 +177,7 @@ class StreamDataActor extends CometActor with KvinListener { val propInfo = propertyInfo(property, propInfos) var timestamp = propInfo.lastTimestamp - val propData = Data.kvin.map(_.fetch(item, property, Kvin.DEFAULT_CONTEXT, KvinTuple.TIME_MAX_VALUE, timestamp, 100, 0L, null) + val propData = Data.kvin.map(_.fetch(item, property, context, KvinTuple.TIME_MAX_VALUE, timestamp, 100, 0L, null) .iterator.asScala.map { e => timestamp = timestamp.max(e.time) ("time", e.time) ~ ("seqNr", decompose(e.seqNr)) ~ ("value", decompose(e.value))